10.0.32

.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,11 +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:
 
@@ -14,8 +20,6 @@ jobs:
     continue-on-error: true
     container:
       image: ${{ env.IMAGE }}
-    outputs:
-      dummy: ${{ true }}
 
     steps:
     - uses: actions/checkout@v3
@@ -41,6 +45,7 @@ jobs:
       continue-on-error: true
 
   test:
+    if: ${{ always() }}
     needs: security
     runs-on: ubuntu-latest
     container:
@@ -96,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.16",
+  "version": "10.0.32",
   "description": "offers smart ways to work with files in nodejs",
   "main": "dist_ts/index.js",
   "typings": "dist_ts/index.d.ts",
@@ -26,30 +26,29 @@
   },
   "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",
-    "@types/fs-extra": "^11.0.1",
+    "@push.rocks/lik": "^6.0.5",
+    "@push.rocks/smartdelay": "^3.0.5",
+    "@push.rocks/smartfile-interfaces": "^1.0.7",
+    "@push.rocks/smarthash": "^3.0.4",
+    "@push.rocks/smartjson": "^5.0.10",
+    "@push.rocks/smartmime": "^1.0.5",
+    "@push.rocks/smartpath": "^5.0.11",
+    "@push.rocks/smartpromise": "^4.0.2",
+    "@push.rocks/smartrequest": "^2.0.18",
+    "@push.rocks/smartstream": "^2.0.4",
+    "@types/fs-extra": "^11.0.2",
     "@types/glob": "^8.1.0",
-    "@types/js-yaml": "^4.0.5",
+    "@types/js-yaml": "^4.0.6",
     "fs-extra": "^11.1.1",
-    "glob": "^10.3.0",
+    "glob": "^10.3.5",
     "js-yaml": "^4.1.0"
   },
   "devDependencies": {
-    "@gitzone/tsbuild": "^2.1.66",
-    "@gitzone/tsrun": "^1.2.42",
-    "@gitzone/tstest": "^1.0.74",
-    "@pushrocks/tapbundle": "^5.0.8",
-    "@types/node": "^20.3.1"
+    "@git.zone/tsbuild": "^2.1.70",
+    "@git.zone/tsrun": "^1.2.46",
+    "@git.zone/tstest": "^1.0.81",
+    "@push.rocks/tapbundle": "^5.0.15",
+    "@types/node": "^20.6.3"
   },
   "files": [
     "ts/**/*",

test/test.ts

@@ -1,7 +1,7 @@
 import * as smartfile from '../ts/index.js';
 import * as path from 'path';
 
-import { expect, tap } from '@pushrocks/tapbundle';
+import { expect, tap } from '@push.rocks/tapbundle';
 
 // ---------------------------
 // smartfile.fs

test/test.virtualdirectory.ts

@@ -1,4 +1,4 @@
-import { tap, expect } from '@pushrocks/tapbundle';
+import { tap, expect } from '@push.rocks/tapbundle';
 
 import * as smartfile from '../ts/index.js';
 

ts/00_commitinfo_data.ts

@@ -2,7 +2,7 @@
  * autocreated commitinfo by @pushrocks/commitinfo
  */
 export const commitinfo = {
-  name: '@pushrocks/smartfile',
-  version: '10.0.16',
+  name: '@push.rocks/smartfile',
+  version: '10.0.32',
   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

@@ -40,7 +40,18 @@ export const fileExists = async (filePath): Promise<boolean> => {
 /**
  * Checks if given path points to an existing directory
  */
-export const isDirectory = (pathArg): boolean => {
+export const isDirectory = (pathArg: string): boolean => {
+  try {
+    return plugins.fsExtra.statSync(pathArg).isDirectory();
+  } catch (err) {
+    return false;
+  }
+};
+
+/**
+ * Checks if given path points to an existing directory
+ */
+export const isDirectorySync = (pathArg: string): boolean => {
   try {
     return plugins.fsExtra.statSync(pathArg).isDirectory();
   } catch (err) {
@@ -244,12 +255,12 @@ export const fileTreeToObject = async (dirPathArg: string, miniMatchFilter: stri
         return filePath;
       }
     })();
-    const fileContentString = toStringSync(readPath);
+    const fileBuffer = plugins.fs.readFileSync(readPath);
 
     // push a read file as Smartfile
     smartfileArray.push(
       new Smartfile({
-        contentBuffer: Buffer.from(fileContentString),
+        contentBuffer: fileBuffer,
         base: dirPath,
         path: filePath,
       })

ts/smartfile.fsstream.ts

@@ -11,4 +11,29 @@ export const createWriteStream = (pathArg: string) => {
   return plugins.fs.createWriteStream(pathArg);
 };
 
-export const streamDirectory = async (dirPathArg: string) => {};
+export const processFile = async (
+  filePath: string,
+  asyncFunc: (fileStream: plugins.stream.Readable) => Promise<void>
+): Promise<void> => {
+  return new Promise((resolve, reject) => {
+    const fileStream = createReadStream(filePath);
+    asyncFunc(fileStream).then(resolve).catch(reject);
+  });
+}
+
+export const processDirectory = async (
+  directoryPath: string,
+  asyncFunc: (fileStream: plugins.stream.Readable) => Promise<void>
+): Promise<void> => {
+  const files = plugins.fs.readdirSync(directoryPath, { withFileTypes: true });
+
+  for (const file of files) {
+    const fullPath = plugins.path.join(directoryPath, file.name);
+
+    if (file.isDirectory()) {
+      await processDirectory(fullPath, asyncFunc); // Recursively call processDirectory for directories
+    } else if (file.isFile()) {
+      await processFile(fullPath, asyncFunc); // Call async function with the file stream and wait for it
+    }
+  }
+};

ts/smartfile.plugins.ts

@@ -1,20 +1,21 @@
 // node native scope
 import * as fs from 'fs';
 import * as path from 'path';
+import * as stream from 'stream';
 
-export { fs, path };
+export { fs, path, stream };
 
 // @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,