10.0.28

.gitea/workflows/default_nottags.yaml

@@ -0,0 +1,67 @@
+name: Default (not tags)
+
+on:
+  push:
+    tags-ignore:
+      - '**'
+
+env:
+  IMAGE: registry.gitlab.com/hosttoday/ht-docker-node:npmci
+  NPMCI_TOKEN_NPM: ${{secrets.NPMCI_TOKEN_NPM}}
+  NPMCI_TOKEN_NPM2: ${{secrets.NPMCI_TOKEN_NPM2}}
+  NPMCI_GIT_GITHUBTOKEN: ${{secrets.NPMCI_GIT_GITHUBTOKEN}}
+  NPMCI_URL_CLOUDLY: ${{secrets.NPMCI_URL_CLOUDLY}}
+
+
+jobs:
+
+  security:
+    runs-on: ubuntu-latest
+    continue-on-error: true
+    container:
+      image: ${{ env.IMAGE }}
+
+    steps:
+    - uses: actions/checkout@v3
+
+    - name: Install pnpm and npmci
+      run: |
+        pnpm install -g pnpm
+        pnpm install -g @shipzone/npmci
+
+    - name: Run npm prepare
+      run: npmci npm prepare
+
+    - name: Audit production dependencies
+      run: |
+        npmci command npm config set registry https://registry.npmjs.org
+        npmci command pnpm audit --audit-level=high --prod
+      continue-on-error: true
+
+    - name: Audit development dependencies
+      run: |
+        npmci command npm config set registry https://registry.npmjs.org
+        npmci command pnpm audit --audit-level=high --dev
+      continue-on-error: true
+
+  test:
+    if: ${{ always() }}
+    needs: security
+    runs-on: ubuntu-latest
+    container:
+      image: ${{ env.IMAGE }}
+
+    steps:
+    - uses: actions/checkout@v3
+
+    - name: Test stable
+      run: |
+        npmci node install stable
+        npmci npm install
+        npmci npm test
+
+    - name: Test build
+      run: |
+        npmci node install stable
+        npmci npm install
+        npmci npm build

.gitea/workflows/default_tags.yaml

@@ -1,9 +1,17 @@
-name: CI Pipeline
+name: Default (tags)
 
-on: push
+on:
+  push:
+    tags:
+      - '*'
 
 env:
   IMAGE: registry.gitlab.com/hosttoday/ht-docker-node:npmci
+  NPMCI_TOKEN_NPM: ${{secrets.NPMCI_TOKEN_NPM}}
+  NPMCI_TOKEN_NPM2: ${{secrets.NPMCI_TOKEN_NPM2}}
+  NPMCI_GIT_GITHUBTOKEN: ${{secrets.NPMCI_GIT_GITHUBTOKEN}}
+  NPMCI_URL_CLOUDLY: ${{secrets.NPMCI_URL_CLOUDLY}}
+
 
 jobs:
 
@@ -11,7 +19,7 @@ jobs:
     runs-on: ubuntu-latest
     continue-on-error: true
     container:
-      image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
+      image: ${{ env.IMAGE }}
 
     steps:
     - uses: actions/checkout@v3
@@ -28,17 +36,20 @@ jobs:
       run: |
         npmci command npm config set registry https://registry.npmjs.org
         npmci command pnpm audit --audit-level=high --prod
+      continue-on-error: true
 
     - name: Audit development dependencies
       run: |
         npmci command npm config set registry https://registry.npmjs.org
         npmci command pnpm audit --audit-level=high --dev
+      continue-on-error: true
 
   test:
+    if: ${{ always() }}
     needs: security
     runs-on: ubuntu-latest
     container:
-      image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
+      image: ${{ env.IMAGE }}
 
     steps:
     - uses: actions/checkout@v3
@@ -60,7 +71,7 @@ jobs:
     if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/')
     runs-on: ubuntu-latest
     container:
-      image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
+      image: ${{ env.IMAGE }}
 
     steps:
     - uses: actions/checkout@v3
@@ -75,7 +86,7 @@ jobs:
     if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/')
     runs-on: ubuntu-latest
     container:
-      image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
+      image: ${{ env.IMAGE }}
     continue-on-error: true
 
     steps:
@@ -90,15 +101,10 @@ jobs:
     - name: Trigger
       run: npmci trigger
 
-    - name: Build docs and upload artifacts
+    - name: Build docs
       run: |
         npmci node install stable
         npmci npm install
-        npmci command npm run buildDocs
-
-    - name: Upload artifacts
-      uses: actions/upload-artifact@v2
-      with:
-        name: public
-        path: public
-        retention-days: 7
+        pnpm install -g @gitzone/tsdoc
+        npmci command tsdoc
+      continue-on-error: true

.gitlab-ci.yml

@@ -1,128 +0,0 @@
-# gitzone ci_default
-image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
-
-cache:
-  paths:
-    - .npmci_cache/
-  key: '$CI_BUILD_STAGE'
-
-stages:
-  - security
-  - test
-  - release
-  - metadata
-
-before_script:
-  - pnpm install -g pnpm
-  - pnpm install -g @shipzone/npmci
-  - npmci npm prepare
-
-# ====================
-# security stage
-# ====================
-# ====================
-# security stage
-# ====================
-auditProductionDependencies:
-  image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
-  stage: security
-  script:
-     - npmci command npm config set registry https://registry.npmjs.org
-     - npmci command pnpm audit --audit-level=high --prod
-  tags:
-    - lossless
-    - docker
-  allow_failure: true
-
-auditDevDependencies:
-  image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
-  stage: security
-  script:
-    - npmci command npm config set registry https://registry.npmjs.org
-    - npmci command pnpm audit --audit-level=high --dev
-  tags:
-    - lossless
-    - docker
-  allow_failure: true
-
-# ====================
-# test stage
-# ====================
-
-testStable:
-  stage: test
-  script:
-    - npmci node install stable
-    - npmci npm install
-    - npmci npm test
-  coverage: /\d+.?\d+?\%\s*coverage/
-  tags:
-    - docker
-
-testBuild:
-  stage: test
-  script:
-    - npmci node install stable
-    - npmci npm install
-    - npmci npm build
-  coverage: /\d+.?\d+?\%\s*coverage/
-  tags:
-    - docker
-
-release:
-  stage: release
-  script:
-    - npmci node install stable
-    - npmci npm publish
-  only:
-    - tags
-  tags:
-    - lossless
-    - docker
-    - notpriv
-
-# ====================
-# metadata stage
-# ====================
-codequality:
-  stage: metadata
-  allow_failure: true
-  only:
-    - tags
-  script:
-    - npmci command npm install -g typescript
-    - npmci npm prepare
-    - npmci npm install
-  tags:
-    - lossless
-    - docker
-    - priv
-
-trigger:
-  stage: metadata
-  script:
-    - npmci trigger
-  only:
-    - tags
-  tags:
-    - lossless
-    - docker
-    - notpriv
-
-pages:
-  stage: metadata
-  script:
-    - npmci node install stable
-    - npmci npm install
-    - npmci command npm run buildDocs
-  tags:
-    - lossless
-    - docker
-    - notpriv
-  only:
-    - tags
-  artifacts:
-    expire_in: 1 week
-    paths:
-      - public
-  allow_failure: true

npmextra.json

@@ -8,10 +8,10 @@
     "projectType": "npm",
     "module": {
       "githost": "gitlab.com",
-      "gitscope": "pushrocks",
+      "gitscope": "push.rocks",
       "gitrepo": "smartfile",
       "description": "smart ways to work with files in nodejs",
-      "npmPackagename": "@pushrocks/smartfile",
+      "npmPackagename": "@push.rocks/smartfile",
       "license": "MIT"
     }
   }

package.json

@@ -1,7 +1,7 @@
 {
-  "name": "@pushrocks/smartfile",
+  "name": "@push.rocks/smartfile",
   "private": false,
-  "version": "10.0.9",
+  "version": "10.0.28",
   "description": "offers smart ways to work with files in nodejs",
   "main": "dist_ts/index.js",
   "typings": "dist_ts/index.d.ts",
@@ -26,22 +26,21 @@
   },
   "homepage": "https://gitlab.com/pushrocks/smartfile",
   "dependencies": {
-    "@pushrocks/lik": "^6.0.2",
-    "@pushrocks/smartdelay": "^3.0.1",
-    "@pushrocks/smartfile-interfaces": "^1.0.7",
-    "@pushrocks/smarthash": "^3.0.2",
-    "@pushrocks/smartjson": "^5.0.6",
-    "@pushrocks/smartmime": "^1.0.5",
-    "@pushrocks/smartpath": "^5.0.5",
-    "@pushrocks/smartpromise": "^4.0.2",
-    "@pushrocks/smartrequest": "^2.0.15",
-    "@pushrocks/smartstream": "^2.0.3",
-    "@pushrocks/streamfunction": "^4.0.4",
+    "@push.rocks/lik": "^6.0.2",
+    "@push.rocks/smartdelay": "^3.0.1",
+    "@push.rocks/smartfile-interfaces": "^1.0.7",
+    "@push.rocks/smarthash": "^3.0.2",
+    "@push.rocks/smartjson": "^5.0.6",
+    "@push.rocks/smartmime": "^1.0.5",
+    "@push.rocks/smartpath": "^5.0.5",
+    "@push.rocks/smartpromise": "^4.0.2",
+    "@push.rocks/smartrequest": "^2.0.15",
+    "@push.rocks/smartstream": "^2.0.3",
     "@types/fs-extra": "^11.0.1",
     "@types/glob": "^8.1.0",
     "@types/js-yaml": "^4.0.5",
     "fs-extra": "^11.1.1",
-    "glob": "^10.3.0",
+    "glob": "^10.3.3",
     "js-yaml": "^4.1.0"
   },
   "devDependencies": {
@@ -49,7 +48,7 @@
     "@gitzone/tsrun": "^1.2.42",
     "@gitzone/tstest": "^1.0.74",
     "@pushrocks/tapbundle": "^5.0.8",
-    "@types/node": "^20.3.1"
+    "@types/node": "^20.4.1"
   },
   "files": [
     "ts/**/*",

ts/00_commitinfo_data.ts

@@ -2,7 +2,7 @@
  * autocreated commitinfo by @pushrocks/commitinfo
  */
 export const commitinfo = {
-  name: '@pushrocks/smartfile',
-  version: '10.0.9',
+  name: '@push.rocks/smartfile',
+  version: '10.0.28',
   description: 'offers smart ways to work with files in nodejs'
 }

ts/smartfile.classes.virtualdirectory.ts

@@ -47,7 +47,7 @@ export class VirtualDirectory {
   }
 
   public async saveToDisk(dirArg: string) {
-    console.log(`writing VirtualDirectory with ${this.smartfileArray.length} to directory:
+    console.log(`writing VirtualDirectory with ${this.smartfileArray.length} files to directory:
     --> ${dirArg}`);
     for (const smartfileArg of this.smartfileArray) {
       const filePath = await smartfileArg.writeToDir(dirArg);
@@ -56,6 +56,22 @@ export class VirtualDirectory {
     }
   }
 
-  // TODO implement root shifting to get subdirectories as new virtual directories
-  // TODO implement root shifting to combine VirtualDirecotries in a parent virtual directory
+  public async shiftToSubdirectory(subDir: string): Promise<VirtualDirectory> {
+    const newVirtualDir = new VirtualDirectory();
+    for (const file of this.smartfileArray) {
+      if (file.path.startsWith(subDir)) {
+        const adjustedFilePath = plugins.path.relative(subDir, file.path);
+        file.path = adjustedFilePath;
+        newVirtualDir.addSmartfiles([file]);
+      }
+    }
+    return newVirtualDir;
+  }
+
+  public async addVirtualDirectory(virtualDir: VirtualDirectory, newRoot: string): Promise<void> {
+    for (const file of virtualDir.smartfileArray) {
+      file.path = plugins.path.join(newRoot, file.path);
+    }
+    this.addSmartfiles(virtualDir.smartfileArray);
+  }
 }

ts/smartfile.fs.ts

@@ -341,8 +341,6 @@ export const listFileTree = async (
   miniMatchFilter: string,
   absolutePathsBool: boolean = false
 ): Promise<string[]> => {
-  const done = plugins.smartpromise.defer<string[]>();
-
   // handle absolute miniMatchFilter
   let dirPath: string;
   if (plugins.path.isAbsolute(miniMatchFilter)) {
@@ -356,15 +354,8 @@ export const listFileTree = async (
     nodir: true,
     dot: true,
   };
-  plugins.glob(miniMatchFilter, options, (err, files: string[]) => {
-    if (err) {
-      console.log(err);
-      done.reject(err);
-    }
-    done.resolve(files);
-  });
 
-  let fileList = await done.promise;
+  let fileList = await plugins.glob.glob(miniMatchFilter, options);
   if (absolutePathsBool) {
     fileList = fileList.map((filePath) => {
       return plugins.path.resolve(plugins.path.join(dirPath, filePath));

ts/smartfile.plugins.ts

@@ -5,16 +5,16 @@ import * as path from 'path';
 export { fs, path };
 
 // @pushrocks scope
-import * as lik from '@pushrocks/lik';
-import * as smartfileInterfaces from '@pushrocks/smartfile-interfaces';
-import * as smartdelay from '@pushrocks/smartdelay';
-import * as smarthash from '@pushrocks/smarthash';
-import * as smartjson from '@pushrocks/smartjson';
-import * as smartmime from '@pushrocks/smartmime';
-import * as smartpath from '@pushrocks/smartpath';
-import * as smartpromise from '@pushrocks/smartpromise';
-import * as smartrequest from '@pushrocks/smartrequest';
-import * as smartstream from '@pushrocks/smartstream';
+import * as lik from '@push.rocks/lik';
+import * as smartfileInterfaces from '@push.rocks/smartfile-interfaces';
+import * as smartdelay from '@push.rocks/smartdelay';
+import * as smarthash from '@push.rocks/smarthash';
+import * as smartjson from '@push.rocks/smartjson';
+import * as smartmime from '@push.rocks/smartmime';
+import * as smartpath from '@push.rocks/smartpath';
+import * as smartpromise from '@push.rocks/smartpromise';
+import * as smartrequest from '@push.rocks/smartrequest';
+import * as smartstream from '@push.rocks/smartstream';
 
 export {
   lik,
@@ -31,7 +31,7 @@ export {
 
 // third party scope
 import fsExtra from 'fs-extra';
-import glob from 'glob';
+import * as glob from 'glob';
 import yaml from 'js-yaml';
 
 export { fsExtra, glob, yaml };

tsconfig.json

@@ -1,8 +1,11 @@
 {
   "compilerOptions": {
     "experimentalDecorators": true,
+    "useDefineForClassFields": false,
+    "target": "ES2022",
+    "module": "ES2022",
+    "moduleResolution": "nodenext",
     "esModuleInterop": true,
-    "target": "ES2017",
-    "moduleResolution": "node"
+    "verbatimModuleSyntax": true,
   }
-}
+}