1.12.3

assets/overrides.json

@@ -0,0 +1,3 @@
+{
+  "peek-readable": "5.3.1"
+}

assets/templates/ci_default/.gitea/workflows/default_nottags.yaml

@@ -6,8 +6,8 @@ on:
       - '**'
 
 env:
-  IMAGE: code.foss.global/hosttoday/ht-docker-node:npmci
-  NPMCI_COMPUTED_REPOURL: https://${-{gitea.repository_owner}-}:${-{secrets.GITEA_TOKEN}-}@{{git.host}}/${-{gitea.repository}-}.git
+  IMAGE: code.foss.global/host.today/ht-docker-node:npmci
+  NPMCI_COMPUTED_REPOURL: https://${-{gitea.repository_owner}-}:${-{secrets.GITEA_TOKEN}-}@{{module.githost}}/${-{gitea.repository}-}.git
   NPMCI_TOKEN_NPM: ${-{secrets.NPMCI_TOKEN_NPM}-}
   NPMCI_TOKEN_NPM2: ${-{secrets.NPMCI_TOKEN_NPM2}-}
   NPMCI_GIT_GITHUBTOKEN: ${-{secrets.NPMCI_GIT_GITHUBTOKEN}-}

assets/templates/ci_default/.gitea/workflows/default_tags.yaml

@@ -6,8 +6,8 @@ on:
       - '*'
 
 env:
-  IMAGE: code.foss.global/hosttoday/ht-docker-node:npmci
-  NPMCI_COMPUTED_REPOURL: https://${-{gitea.repository_owner}-}:${-{secrets.GITEA_TOKEN}-}@{{git.host}}/${-{gitea.repository}-}.git
+  IMAGE: code.foss.global/host.today/ht-docker-node:npmci
+  NPMCI_COMPUTED_REPOURL: https://${-{gitea.repository_owner}-}:${-{secrets.GITEA_TOKEN}-}@{{module.githost}}/${-{gitea.repository}-}.git
   NPMCI_TOKEN_NPM: ${-{secrets.NPMCI_TOKEN_NPM}-}
   NPMCI_TOKEN_NPM2: ${-{secrets.NPMCI_TOKEN_NPM2}-}
   NPMCI_GIT_GITHUBTOKEN: ${-{secrets.NPMCI_GIT_GITHUBTOKEN}-}

assets/templates/ci_default_private/.gitea/workflows/default_nottags.yaml

@@ -7,7 +7,7 @@ on:
 
 env:
   IMAGE: code.foss.global/hosttoday/ht-docker-node:npmci
-  NPMCI_COMPUTED_REPOURL: https://${-{gitea.repository_owner}-}:${-{secrets.GITEA_TOKEN}-}@{{git.host}}/${-{gitea.repository}-}.git
+  NPMCI_COMPUTED_REPOURL: https://${-{gitea.repository_owner}-}:${-{secrets.GITEA_TOKEN}-}@{{module.githost}}/${-{gitea.repository}-}.git
   NPMCI_TOKEN_NPM: ${-{secrets.NPMCI_TOKEN_NPM}-}
   NPMCI_TOKEN_NPM2: ${-{secrets.NPMCI_TOKEN_NPM2}-}
   NPMCI_GIT_GITHUBTOKEN: ${-{secrets.NPMCI_GIT_GITHUBTOKEN}-}

assets/templates/ci_default_private/.gitea/workflows/default_tags.yaml

@@ -7,7 +7,7 @@ on:
 
 env:
   IMAGE: code.foss.global/hosttoday/ht-docker-node:npmci
-  NPMCI_COMPUTED_REPOURL: https://${-{gitea.repository_owner}-}:${-{secrets.GITEA_TOKEN}-}@{{git.host}}/${-{gitea.repository}-}.git
+  NPMCI_COMPUTED_REPOURL: https://${-{gitea.repository_owner}-}:${-{secrets.GITEA_TOKEN}-}@{{module.githost}}/${-{gitea.repository}-}.git
   NPMCI_TOKEN_NPM: ${-{secrets.NPMCI_TOKEN_NPM}-}
   NPMCI_TOKEN_NPM2: ${-{secrets.NPMCI_TOKEN_NPM2}-}
   NPMCI_GIT_GITHUBTOKEN: ${-{secrets.NPMCI_GIT_GITHUBTOKEN}-}

assets/templates/ci_docker/.gitea/workflows/docker_nottags.yaml

@@ -7,7 +7,7 @@ on:
 
 env:
   IMAGE: code.foss.global/hosttoday/ht-docker-node:npmci
-  NPMCI_COMPUTED_REPOURL: https://${-{gitea.repository_owner}-}:${-{secrets.GITEA_TOKEN}-}@{{gi.host}}/${-{gitea.repository}-}.git
+  NPMCI_COMPUTED_REPOURL: https://${-{gitea.repository_owner}-}:${-{secrets.GITEA_TOKEN}-}@{{module.githost}}/${-{gitea.repository}-}.git
   NPMCI_TOKEN_NPM: ${-{secrets.NPMCI_TOKEN_NPM}-}
   NPMCI_TOKEN_NPM2: ${-{secrets.NPMCI_TOKEN_NPM2}-}
   NPMCI_GIT_GITHUBTOKEN: ${-{secrets.NPMCI_GIT_GITHUBTOKEN}-}

assets/templates/ci_docker/.gitea/workflows/docker_tags.yaml

@@ -7,7 +7,7 @@ on:
 
 env:
   IMAGE: code.foss.global/hosttoday/ht-docker-node:npmci
-  NPMCI_COMPUTED_REPOURL: https://${-{gitea.repository_owner}-}:${-{secrets.GITEA_TOKEN}-}@{{git.host}}/${-{gitea.repository}-}.git
+  NPMCI_COMPUTED_REPOURL: https://${-{gitea.repository_owner}-}:${-{secrets.GITEA_TOKEN}-}@{{module.githost}}/${-{gitea.repository}-}.git
   NPMCI_TOKEN_NPM: ${-{secrets.NPMCI_TOKEN_NPM}-}
   NPMCI_TOKEN_NPM2: ${-{secrets.NPMCI_TOKEN_NPM2}-}
   NPMCI_GIT_GITHUBTOKEN: ${-{secrets.NPMCI_GIT_GITHUBTOKEN}-}
@@ -89,8 +89,8 @@ jobs:
           npmci docker login
           npmci docker build
           npmci docker test
-          # npmci docker push {{git.host}}
-          npmci docker push {{git.host}}
+          # npmci docker push {{module.githost}}
+          npmci docker push {{module.githost}}
 
   metadata:
     needs: test

assets/templates/dockerfile_service/Dockerfile

@@ -1,6 +1,6 @@
 # gitzone dockerfile_service
 ## STAGE 1 // BUILD
-FROM code.foss.global/hosttoday/ht-docker-node:npmci as node1
+FROM code.foss.global/host.today/ht-docker-node:npmci as node1
 COPY ./ /app
 WORKDIR /app
 ARG NPMCI_TOKEN_NPM2
@@ -12,7 +12,7 @@ RUN pnpm run build
 
 # gitzone dockerfile_service
 ## STAGE 2 // install production
-FROM code.foss.global/hosttoday/ht-docker-node:npmci as node2
+FROM code.foss.global/host.today/ht-docker-node:npmci as node2
 WORKDIR /app
 COPY --from=node1 /app /app
 RUN rm -rf .pnpm-store
@@ -24,7 +24,7 @@ RUN rm -rf node_modules/ && pnpm install --prod
 
 
 ## STAGE 3 // rebuild dependencies for alpine
-FROM code.foss.global/hosttoday/ht-docker-node:alpinenpmci as node3
+FROM code.foss.global/host.today/ht-docker-node:alpine_npmci as node3
 WORKDIR /app
 COPY --from=node2 /app /app
 ARG NPMCI_TOKEN_NPM2
@@ -34,7 +34,7 @@ RUN pnpm config set store-dir .pnpm-store
 RUN pnpm rebuild -r
 
 ## STAGE 4 // the final production image with all dependencies in place
-FROM code.foss.global/hosttoday/ht-docker-node:alpine as node4
+FROM code.foss.global/host.today/ht-docker-node:alpine as node4
 WORKDIR /app
 COPY --from=node3 /app /app
 

assets/templates/gitignore/_gitignore

@@ -6,7 +6,6 @@ fileName: .gitignore
 # artifacts
 coverage/
 public/
-pages/
 
 # installs
 node_modules/
@@ -20,4 +19,4 @@ node_modules/
 dist/
 dist_*/
 
-# custom
+#------# custom

assets/templates/service/.package.json

@@ -21,14 +21,14 @@ fileName: package.json
     "@git.zone/tsrun": "^1.2.8",
     "@git.zone/tstest": "^1.0.28",
     "@git.zone/tswatch": "^2.0.1",
-    "@push.rocks/tapbundle": "^5.0.3"
+    "@push.rocks/tapbundle": "^5.5.4"
   },
   "dependencies": {
-    "@api.global/typedserver": "^1.0.24",
+    "@api.global/typedserver": "^3.0.53",
     "@push.rocks/projectinfo": "^5.0.1",
-    "@push.rocks/qenv": "^4.0.10",
+    "@push.rocks/qenv": "^6.1.0",
     "@push.rocks/smartdata": "^5.0.7",
     "@push.rocks/smartpath": "^5.0.5",
     "@push.rocks/smartstate": "^2.0.0"
-  }
+  },
 }

assets/templates/service/ts/classes.some.db.ts

@@ -1,8 +1,8 @@
 ---
-fileName: {{module.name}}.classes.{{module.name}}db.ts
+fileName: classes.{{module.name}}db.ts
 ---
 import * as plugins from './{{module.name}}.plugins.js';
-import { {{module.name}} } from './{{module.name}}.classes.{{module.name}}.js';
+import { {{module.name}} } from './classes.{{module.name}}.js';
 
 
 

assets/templates/service/ts/classes.some.ts

@@ -1,9 +1,9 @@
 ---
-fileName: {{module.name}}.classes.{{module.name}}.ts
+fileName: classes.{{module.name}}.ts
 ---
 import * as plugins from './{{module.name}}.plugins.js';
 import * as paths from './{{module.name}}.paths.js';
-import { {{module.name}}Db } from './{{module.name}}.db.js'
+import { {{module.name}}Db } from './classes.{{module.name}}db.js'
 
 export class {{module.name}} {
   public projectinfo: plugins.projectinfo.ProjectInfo;

assets/templates/service/ts/some.plugins.ts

@@ -15,8 +15,7 @@ export {
   loleServiceserver
 }
 
-// pushrocks scope
-// pushrocks scope
+// @push.rocks scope
 import * as projectinfo from '@push.rocks/projectinfo';
 import * as qenv from '@push.rocks/qenv';
 import * as smartdata from '@push.rocks/smartdata';

assets/templates/tsconfig_update/tsconfig.json

@@ -1,6 +1,7 @@
 {
   "compilerOptions": {
     "experimentalDecorators": true,
+    "emitDecoratorMetadata": true,
     "useDefineForClassFields": false,
     "target": "ES2022",
     "module": "NodeNext",

assets/templates/website/ts_web/elements/header.ts

@@ -6,7 +6,7 @@ import {
   cssManager,
   unsafeCSS,
   css,
-  TemplateResult,
+  type TemplateResult,
 } from '@design.estate/dees-element';
 
 @customElement('default-header')

changelog.md

@@ -1,5 +1,73 @@
 # Changelog
 
+## 2025-01-29 - 1.12.2 - fix(format)
+Add overrides for peek-readable in package.json formatting
+
+- Added a URL correction in the packageJson repository information.
+- Introduced support for pnpm overrides by including an `overrides.json` file.
+
+## 2025-01-18 - 1.12.1 - fix(dependencies)
+Update various package dependencies and Dockerfile base image
+
+- Updated Dockerfile base image from 'alpinenpmci' to 'alpine_npmci'.
+- Upgraded @git.zone/tsbuild, @git.zone/tsrun, @git.zone/tsdoc, and other dependencies to their latest versions.
+
+## 2025-01-17 - 1.12.0 - feat(build)
+Update TypeScript configuration to support emit decorator metadata
+
+- Added emitDecoratorMetadata to the tsconfig.json template in assets/templates/tsconfig_update.
+
+## 2025-01-08 - 1.11.0 - feat(cli)
+Add Docker command for cleaning up Docker system and extend deprecation command for multiple registries
+
+- Added a new command 'docker' to handle Docker system cleanup operations.
+- Improved the 'deprecate' command to support deprecating packages across multiple npm registry URLs.
+
+## 2025-01-01 - 1.10.10 - fix(templates)
+Corrected typo in template file comment
+
+- Fixed repeated comment in the template file for services under 'assets/templates/service/ts/some.plugins.ts'.
+
+## 2025-01-01 - 1.10.9 - fix(templates)
+Correct template file paths and organization for service projects
+
+- Moved 'some.classes.some.ts' to 'classes.some.ts'
+- Moved 'some.classes.some.db.ts' to 'classes.some.db.ts'
+- Resolved incorrect import paths in service templates
+
+## 2025-01-01 - 1.10.8 - fix(assets/templates)
+Update CI template configurations to use module.githost
+
+- Replaced occurrences of {{git.host}} with {{module.githost}} in CI workflow files
+- Updated package dependencies for service template
+
+## 2024-12-26 - 1.10.7 - fix(assets)
+Correct URLs in templates and fix TypeScript declaration
+
+- Updated incorrect URLs in Dockerfile templates to 'host.today'.
+- Fixed type declaration for 'TemplateResult' in header.ts file.
+
+## 2024-12-08 - 1.10.6 - fix(ci)
+Corrected Docker image URL in CI templates
+
+- Updated Docker image URL from 'code.foss.global/hosttoday' to 'code.foss.global/host.today' in default_nottags.yaml and default_tags.yaml.
+- Adjusted gitignore template to include a custom section delineation.
+
+## 2024-12-02 - 1.10.5 - fix(assets)
+Update .gitignore template to remove pages directory
+
+- Removed 'pages/' from the ignored directories in the .gitignore template.
+
+## 2024-11-05 - 1.10.4 - fix(mod_format)
+Correct file extension for TypeScript path configuration
+
+- Fixed the TypeScript configuration to use correct file extensions for module subdirectories.
+
+## 2024-10-27 - 1.10.3 - fix(mod_format)
+Reorder TypeScript formatting steps in mod_format module
+
+- Moved TypeScript configuration formatting earlier in the sequence for better logical consistency.
+
 ## 2024-10-27 - 1.10.2 - fix(format)
 Add logging for tsconfig.json formatting
 

package.json

@@ -1,7 +1,7 @@
 {
   "name": "@git.zone/cli",
   "private": false,
-  "version": "1.10.2",
+  "version": "1.12.3",
   "description": "A CLI toolbelt to streamline local development cycles by using various gitzone utilities.",
   "main": "dist_ts/index.ts",
   "typings": "dist_ts/index.d.ts",
@@ -52,24 +52,24 @@
   },
   "homepage": "https://pages.foss.global/git.zone/cli",
   "devDependencies": {
-    "@git.zone/tsbuild": "^2.1.84",
-    "@git.zone/tsrun": "^1.2.49",
+    "@git.zone/tsbuild": "^2.2.0",
+    "@git.zone/tsrun": "^1.3.3",
     "@git.zone/tstest": "^1.0.90",
-    "@types/node": "^22.8.1"
+    "@types/node": "^22.10.7"
   },
   "dependencies": {
-    "@git.zone/tsdoc": "^1.3.12",
-    "@git.zone/tspublish": "^1.4.0",
+    "@git.zone/tsdoc": "^1.4.3",
+    "@git.zone/tspublish": "^1.9.1",
     "@push.rocks/commitinfo": "^1.0.12",
     "@push.rocks/early": "^4.0.4",
     "@push.rocks/gulp-function": "^3.0.7",
     "@push.rocks/lik": "^6.0.15",
-    "@push.rocks/npmextra": "^5.0.23",
+    "@push.rocks/npmextra": "^5.1.2",
     "@push.rocks/projectinfo": "^5.0.2",
     "@push.rocks/smartchok": "^1.0.34",
     "@push.rocks/smartcli": "^4.0.11",
     "@push.rocks/smartdelay": "^3.0.5",
-    "@push.rocks/smartfile": "^11.0.21",
+    "@push.rocks/smartfile": "^11.1.5",
     "@push.rocks/smartgulp": "^3.0.4",
     "@push.rocks/smartinteract": "^2.0.15",
     "@push.rocks/smartjson": "^5.0.20",
@@ -81,16 +81,21 @@
     "@push.rocks/smartobject": "^1.0.12",
     "@push.rocks/smartopen": "^2.0.0",
     "@push.rocks/smartpath": "^5.0.18",
-    "@push.rocks/smartpromise": "^4.0.4",
+    "@push.rocks/smartpromise": "^4.1.0",
     "@push.rocks/smartscaf": "^4.0.15",
-    "@push.rocks/smartshell": "^3.0.6",
-    "@push.rocks/smartstream": "^3.0.44",
+    "@push.rocks/smartshell": "^3.2.2",
+    "@push.rocks/smartstream": "^3.2.5",
     "@push.rocks/smartunique": "^3.0.9",
     "@push.rocks/smartupdate": "^2.0.6",
     "@types/through2": "^2.0.41",
-    "prettier": "^3.3.3",
+    "prettier": "^3.4.2",
     "through2": "^4.0.2"
   },
+  "pnpm": {
+    "overrides": {
+      "peek-readable": "5.3.1"
+    }
+  },
   "files": [
     "ts/**/*",
     "ts_web/**/*",

ts/00_commitinfo_data.ts

@@ -3,6 +3,6 @@
  */
 export const commitinfo = {
   name: '@git.zone/cli',
-  version: '1.10.2',
+  version: '1.12.2',
   description: 'A CLI toolbelt to streamline local development cycles by using various gitzone utilities.'
 }

ts/gitzone.cli.ts

@@ -48,6 +48,14 @@ export let run = async () => {
     await modDeprecate.run();
   });
 
+  /**
+   * docker
+   */
+  gitzoneSmartcli.addCommand('docker').subscribe(async (argvArg) => {
+    const modDocker = await import('./mod_docker/index.js');
+    await modDocker.run(argvArg);
+  });
+
   /**
    * Update all files that comply with the gitzone standard
    */

ts/mod_deprecate/index.ts

@@ -4,6 +4,15 @@ import { logger } from '../gitzone.logging.js';
 
 export const run = async () => {
   const smartInteract = new plugins.smartinteract.SmartInteract([
+    {
+      name: `registryUrls`,
+      message: `What are the comma separated registry URLs?`,
+      type: `input`,
+      default: `https://registry.npmjs.org`,
+      validate: (stringInput) => {
+        return stringInput !== '' && !process.env.CI;
+      },
+    },
     {
       name: `oldPackageName`,
       message: `Whats the name of the OLD package?`,
@@ -24,14 +33,17 @@ export const run = async () => {
     },
   ]);
   const answerBucket = await smartInteract.runQueue();
+  const registryUrls = answerBucket.getAnswerFor(`registryUrls`).split(',');
   const oldPackageName = answerBucket.getAnswerFor(`oldPackageName`);
   const newPackageName = answerBucket.getAnswerFor(`newPackageName`);
   logger.log('info', `Deprecating package ${oldPackageName} in favour of ${newPackageName}`);
   const smartshellInstance = new plugins.smartshell.Smartshell({
     executor: 'bash',
   });
-  await smartshellInstance.exec(
-    `npm deprecate ${oldPackageName}@* ` +
-      `"${oldPackageName} has been deprecated in favour of ${newPackageName} - please upgrade asap!!!"`
-  );
+  for (const registryUrl of registryUrls) {
+    await smartshellInstance.exec(
+      `npm deprecate ${oldPackageName}@* ` +
+        `"${oldPackageName} has been deprecated in favour of ${newPackageName} - please upgrade asap!!!" --registry ${registryUrl}`,
+    );
+  }
 };

ts/mod_docker/index.ts

@@ -0,0 +1,12 @@
+import * as plugins from './mod.plugins.js';
+
+export const run = async (argvArg) => {
+  const smartshellInstance = new plugins.smartshell.Smartshell({
+    executor: 'bash',
+  });
+  switch (argvArg._[1]) {
+    case 'prune':
+      await smartshellInstance.exec(`docker system prune -a -f --volumes`);
+      break;
+  }
+};

ts/mod_docker/mod.plugins.ts

@@ -0,0 +1,4 @@
+export * from '../plugins.js';
+
+import * as smartshell from '@push.rocks/smartshell';
+export { smartshell };

ts/mod_format/format.packagejson.ts

@@ -27,7 +27,7 @@ export const run = async (projectArg: Project) => {
       // metadata
       packageJson.repository = {
         type: 'git',
-        url: `git+https://${gitzoneData.module.githost}/${gitzoneData.module.gitscope}/${gitzoneData.module.gitrepo}.git`,
+        url: `https://${gitzoneData.module.githost}/${gitzoneData.module.gitscope}/${gitzoneData.module.gitrepo}.git`,
       };
       (packageJson.bugs = {
         url: `https://${gitzoneData.module.githost}/${gitzoneData.module.gitscope}/${gitzoneData.module.gitrepo}/issues`,
@@ -89,6 +89,13 @@ export const run = async (projectArg: Project) => {
       await ensureDependency(packageJson, 'devDep', 'latest', '@git.zone/tstest');
       await ensureDependency(packageJson, 'devDep', 'latest', '@git.zone/tsbuild');
 
+      // set overrides
+      const overrides = plugins.smartfile.fs.toObjectSync(
+        plugins.path.join(paths.assetsDir, 'overrides.json'),
+      )
+      packageJson.pnpm = packageJson.pnpm || {};
+      packageJson.pnpm.overrides = overrides;
+
       // exclude
       // TODO
 

ts/mod_format/format.tsconfig.ts

@@ -17,7 +17,7 @@ export const run = async (projectArg: Project) => {
   const publishModules = await tsPublishInstance.getModuleSubDirs(paths.cwd);
   for (const publishModule of Object.keys(publishModules)) {
     const publishConfig = publishModules[publishModule];
-    tsconfigObject.compilerOptions.paths[`${publishConfig.name}`] = [`./${publishModule}/index.ts`];
+    tsconfigObject.compilerOptions.paths[`${publishConfig.name}`] = [`./${publishModule}/index.js`];
   }
   tsconfigSmartfile.setContentsFromString(JSON.stringify(tsconfigObject, null, 2));
   await tsconfigSmartfile.write();

ts/mod_format/index.ts

@@ -29,10 +29,10 @@ export let run = async (writeArg: boolean = true): Promise<any> => {
   await formatGitignore.run(project);
 
   // format TypeScript
-  const formatPrettier = await import('./format.prettier.js');
-  await formatPrettier.run(project);
   const formatTsConfig = await import('./format.tsconfig.js');
   await formatTsConfig.run(project);
+  const formatPrettier = await import('./format.prettier.js');
+  await formatPrettier.run(project);
 
   // format readme.md
   const formatReadme = await import('./format.readme.js');