qcobjects-cli 2.5.148-beta → 2.5.153-beta

package/public/types/index.d.ts

@@ -152,7 +152,7 @@ declare module "cli-main" {
         };
         program: any;
         constructor();
-        shellCommands(_shell_commands: any[]): Promise<unknown>;
+        shellCommands(_shell_commands: any[]): Promise<any[]>;
         fileListRecursive(dir: string): string | string[];
         register(email: any, phonenumber: any): Promise<unknown>;
         generateServiceWorker(appName: any, dirPrefix?: string): Promise<unknown>;
@@ -186,7 +186,7 @@ declare module "cli-commands-version" {
         constructor({ switchCommander }: {
             switchCommander: SwitchCommander;
         });
-        syncGit(versionString: any, commitMsg: any, syncNpm?: boolean): void;
+        syncGit(versionString: any, commitMsg: any, syncNpm?: boolean): Promise<void>;
         parseVersionString(versionString: string): {
             major: string;
             minor: string;

package/src/cli-commands-version.ts

@@ -55,7 +55,7 @@ export class CommandHandler extends InheritClass {
     const commandHandler = this;
 
     this.choiceOption = {
-      v_major(filename: string, options: any) {
+      async v_major(filename: string, options: any) {
         filename = (typeof filename === "undefined") ? ("VERSION") : (filename);
         const versionString = this.getVersionStringFromFile(filename);
         const versionSuffix = this.parseVersionSuffix(versionString);
@@ -67,10 +67,10 @@ export class CommandHandler extends InheritClass {
         this.saveNewVersionFile(filename, newVersion);
         if (options.syncGit) {
           var commitMsg = options.commitMsg || `New Version v${newVersion}`;
-          this.syncGit(newVersion, commitMsg, options.syncNpm);
+          await this.syncGit(newVersion, commitMsg, options.syncNpm);
         }
       },
-      v_minor(filename: string, options: any) {
+      async v_minor(filename: string, options: any) {
         filename = (typeof filename === "undefined") ? ("VERSION") : (filename);
         const versionString = this.getVersionStringFromFile(filename);
         const versionSuffix = this.parseVersionSuffix(versionString);
@@ -82,10 +82,10 @@ export class CommandHandler extends InheritClass {
         this.saveNewVersionFile(filename, newVersion);
         if (options.syncGit) {
           var commitMsg = options.commitMsg || `New Version v${newVersion}`;
-          this.syncGit(newVersion, commitMsg, options.syncNpm);
+          await this.syncGit(newVersion, commitMsg, options.syncNpm);
         }
       },
-      v_patch(filename: string, options: any) {
+      async v_patch(filename: string, options: any) {
         filename = (typeof filename === "undefined") ? ("VERSION") : (filename);
         const versionString = this.getVersionStringFromFile(filename);
         const versionSuffix = this.parseVersionSuffix(versionString);
@@ -97,7 +97,7 @@ export class CommandHandler extends InheritClass {
         this.saveNewVersionFile(filename, newVersion);
         if (options.syncGit) {
           var commitMsg = options.commitMsg || `New Version v${newVersion}`;
-          this.syncGit(newVersion, commitMsg, options.syncNpm);
+          await this.syncGit(newVersion, commitMsg, options.syncNpm);
         }
       },
       v_sync(filename: string, options: any) {
@@ -172,7 +172,7 @@ export class CommandHandler extends InheritClass {
       .option("-m, --commit-msg [message]", "Commit Message")
       .description("Semantic Versioning: Upgrade to a new major version")
       .action(function (args: any, options: any) {
-        commandHandler.choiceOption.v_major.call(commandHandler, args, options);
+        return commandHandler.choiceOption.v_major.call(commandHandler, args, options);
       });
     switchCommander.program.command("v-minor [filename]")
       .option("--git, --sync-git", "Sync with Git")
@@ -180,16 +180,15 @@ export class CommandHandler extends InheritClass {
       .option("-m, --commit-msg [message]", "Commit Message")
       .description("Semantic Versioning: Upgrade to a new minor version")
       .action(function (args: any, options: any) {
-        commandHandler.choiceOption.v_minor.call(commandHandler, args, options);
+        return commandHandler.choiceOption.v_minor.call(commandHandler, args, options);
       });
-
     switchCommander.program.command("v-patch [filename]")
       .option("--git, --sync-git", "Sync with Git")
       .option("--npm, --sync-npm", "Sync with NPM")
       .option("-m, --commit-msg [message]", "Commit Message")
       .description("Semantic Versioning: Upgrade to a new patch version")
       .action(function (args: any, options: any) {
-        commandHandler.choiceOption.v_patch.call(commandHandler, args, options);
+        return commandHandler.choiceOption.v_patch.call(commandHandler, args, options);
       });
 
     switchCommander.program.command("v-sync [filename]")
@@ -232,7 +231,7 @@ export class CommandHandler extends InheritClass {
 
     _commands_.push("git push && git push --tags");
 
-    this.switchCommander.shellCommands(_commands_).then(function (response: any) {
+    return this.switchCommander.shellCommands(_commands_).then(function (response: any) {
       logger.info("Synced to Git");
       logger.debug(response);
     }).catch(function (e: any) {

package/transpile.js

@@ -1,5 +1,7 @@
 const ts = require('typescript');
 const path = require('path');
+const { readFileSync, writeFileSync } = require('fs');
+const glob = require('glob');
 
 // Get the tsconfig file name from command line arguments
 const configFileName = process.argv[2];
@@ -59,6 +61,36 @@ if (emittedFiles.length > 0) {
   emittedFiles.forEach(file => console.log(file));
 }
 
+// Post-process CJS output: convert await import(var) → require(var) for data file imports
+// Detects variables assigned to paths ending in .json/.jsonp/.md/.mdc/.text/.txt
+const extensionsToConvert = ['json', 'jsonp', 'md', 'mdc', 'text', 'txt'];
+const extPattern = extensionsToConvert.join('|');
+const varDeclRegex = new RegExp(
+  `(?:const|let|var)\\s+(\\w+)\\s*=[^;]*?\\.(?:${extPattern})["'\`][^;]*;`,
+  'g'
+);
+
+glob.sync('public/cjs/**/*.js').forEach(file => {
+  const content = readFileSync(file, 'utf8');
+
+  const jsonVars = new Set();
+  let match;
+  while ((match = varDeclRegex.exec(content)) !== null) {
+    jsonVars.add(match[1]);
+  }
+
+  if (jsonVars.size > 0) {
+    const importRegex = new RegExp(
+      `await import\\((${[...jsonVars].join('|')})\\)`,
+      'g'
+    );
+    const newContent = content.replace(importRegex, 'require($1)');
+    if (newContent !== content) {
+      writeFileSync(file, newContent, 'utf8');
+    }
+  }
+});
+
 // Exit with an appropriate code
 const exitCode = emitResult.emitSkipped ? 1 : 0;
 console.log(`Process exiting with code '${exitCode}'.`);

package/.github/workflows/npmpublish-beta.yml

@@ -1,43 +0,0 @@
-# This workflow will run tests using node and then publish a package to GitHub Packages when a release is created
-# For more information see: https://help.github.com/actions/language-and-framework-guides/publishing-nodejs-packages
-
-name: Node.js Publish Beta version
-
-on:
-  push:
-    tags:
-      - 'v*.*.*-beta'
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          ref: ${{ github.ref }}
-      - uses: actions/setup-node@v4
-        with:
-          node-version: 22
-      - run: npm i --legacy-peer-deps
-      - run: npm test
-
-  publish-npm:
-    needs: build
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      id-token: write
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          ref: ${{ github.ref }}
-      - uses: actions/setup-node@v4
-        with:
-          node-version: 22
-      - name: Upgrade npm for OIDC support (requires >=11.5.1)
-        run: npm install -g npm@latest
-      - run: npm i --legacy-peer-deps
-      - run: npm test
-      - run: npm publish --tag beta

package/.github/workflows/npmpublish-main.yml

@@ -1,44 +0,0 @@
-# This workflow will run tests using node and then publish a package to GitHub Packages when a release is created
-# For more information see: https://help.github.com/actions/language-and-framework-guides/publishing-nodejs-packages
-
-name: Node.js Publish Package
-
-on:
-  push:
-    tags:
-      - 'v*.*.*'
-
-jobs:
-  build:
-    if: ${{ !contains(github.ref, '-') }}
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          ref: ${{ github.ref }}
-      - uses: actions/setup-node@v4
-        with:
-          node-version: 22
-      - run: npm i --legacy-peer-deps
-      - run: npm test
-
-  publish-npm:
-    needs: build
-    if: ${{ !contains(github.ref, '-') }}
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      id-token: write
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          ref: ${{ github.ref }}
-      - uses: actions/setup-node@v4
-        with:
-          node-version: 22
-      - name: Upgrade npm for OIDC support (requires >=11.5.1)
-        run: npm install -g npm@latest
-      - run: npm i --legacy-peer-deps
-      - run: npm publish