1.10.10

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

@@ -6,8 +6,8 @@ on:
       - '**'
 
 env:
-  IMAGE: code.foss.global/hosttoday/ht-docker-node:npmci
+  IMAGE: code.foss.global/host.today/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/.gitea/workflows/default_tags.yaml

@@ -6,8 +6,8 @@ on:
       - '*'
 
 env:
-  IMAGE: code.foss.global/hosttoday/ht-docker-node:npmci
+  IMAGE: code.foss.global/host.today/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_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 {{module.githost}}
-          npmci docker push {{git.host}}
+          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:alpinenpmci 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
+// @push.rocks scope
-// pushrocks scope
 import * as projectinfo from '@push.rocks/projectinfo';
 import * as qenv from '@push.rocks/qenv';
 import * as smartdata from '@push.rocks/smartdata';

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,78 @@
 # Changelog
 
+## 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
+
+- Added an info log message for tsconfig.json formatting in format.tsconfig.ts.
+
+## 2024-10-27 - 1.10.1 - fix(format)
+Fixed async issue in tsconfig module lookup and corrected property access
+
+
+## 2024-10-27 - 1.10.0 - feat(mod_format)
+Add support for tsconfig.json formatting
+
+- Added a new script to format tsconfig.json.
+- Updated package.json to include `@git.zone/tspublish` as a dependency.
+
+## 2024-10-23 - 1.9.126 - fix(format)
+Remove redundant package.json property checks
+
+- Removed property checks for `main`, `typings`, and `browserslist` from format.packagejson.ts
+- This change streamlines the formatting process by removing unnecessary exits
+
+## 2024-09-29 - 1.9.125 - fix(cli)
+Fix package version configuration and formatting issues
+
+- Updated metadata fields in package.json (repository URL, bugs URL, and homepage).
+- Ensured presence and correctness of essential fields in package.json (main, typings, files, scripts, etc.).
+- Added missing Prettier default TypeScript and Markdown configurations.
+
 ## 2024-09-27 - 1.9.124 - fix(cli)
 Ensured proper existence and initialization of readme files
 

package.json

@@ -1,7 +1,7 @@
 {
   "name": "@git.zone/cli",
   "private": false,
-  "version": "1.9.124",
+  "version": "1.10.10",
   "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",
@@ -55,10 +55,11 @@
     "@git.zone/tsbuild": "^2.1.84",
     "@git.zone/tsrun": "^1.2.49",
     "@git.zone/tstest": "^1.0.90",
-    "@types/node": "^22.7.4"
+    "@types/node": "^22.8.1"
   },
   "dependencies": {
     "@git.zone/tsdoc": "^1.3.12",
+    "@git.zone/tspublish": "^1.4.0",
     "@push.rocks/commitinfo": "^1.0.12",
     "@push.rocks/early": "^4.0.4",
     "@push.rocks/gulp-function": "^3.0.7",

ts/00_commitinfo_data.ts

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

ts/mod_commit/index.ts

@@ -5,6 +5,12 @@ import * as paths from '../paths.js';
 import { logger } from '../gitzone.logging.js';
 
 export const run = async (argvArg: any) => {
+  if (argvArg.format) {
+    const formatMod = await import('../mod_format/index.js');
+    await formatMod.run();
+  }
+
+
   logger.log('info', `gathering facts...`);
   const aidoc = new plugins.tsdoc.AiDoc();
   await aidoc.start();

ts/mod_format/format.packagejson.ts

@@ -70,23 +70,6 @@ export const run = async (projectArg: Project) => {
         packageJson.scripts.buildDocs = `tsdoc`;
       }
 
-      // check package.json
-      if (!packageJson.main) {
-        logger.log('error', 'no "main" property');
-        process.exit(0);
-      }
-      if (!packageJson.typings) {
-        logger.log('error', 'no "typings" property');
-        process.exit(0);
-      }
-      if (!packageJson.browserslist) {
-        packageJson.browserslist = ['last 1 chrome versions'];
-      }
-      if (!packageJson.main.includes('dist_') || !packageJson.typings.includes('dist_')) {
-        logger.log('error', 'check packagesJson main and typings');
-        process.exit(0);
-      }
-
       // check for files
       packageJson.files = [
         'ts/**/*',

ts/mod_format/format.tsconfig.ts

@@ -0,0 +1,24 @@
+import * as plugins from './mod.plugins.js';
+import * as paths from '../paths.js';
+
+import { logger } from '../gitzone.logging.js';
+import { Project } from '../classes.project.js';
+
+export const run = async (projectArg: Project) => {
+  // lets care about tsconfig.json
+  logger.log('info', 'Formatting tsconfig.json...');
+  const tsconfigSmartfile = await plugins.smartfile.SmartFile.fromFilePath(plugins.path.join(paths.cwd, 'tsconfig.json'));
+  const tsconfigObject = JSON.parse(tsconfigSmartfile.contentBuffer.toString());
+  tsconfigObject.compilerOptions = tsconfigObject.compilerOptions || {};
+  tsconfigObject.compilerOptions.baseUrl = '.';
+  tsconfigObject.compilerOptions.paths = {};
+  const tsPublishMod = await import('@git.zone/tspublish');
+  const tsPublishInstance = new tsPublishMod.TsPublish();
+  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.js`];
+  }
+  tsconfigSmartfile.setContentsFromString(JSON.stringify(tsconfigObject, null, 2));
+  await tsconfigSmartfile.write();
+};

ts/mod_format/index.ts

@@ -1,7 +1,7 @@
 import * as plugins from './mod.plugins.js';
 import { Project } from '../classes.project.js';
 
-export let run = async (write: boolean = true): Promise<any> => {
+export let run = async (writeArg: boolean = true): Promise<any> => {
   const project = await Project.fromCwd();
 
   // cleanup
@@ -29,6 +29,8 @@ export let run = async (write: boolean = true): Promise<any> => {
   await formatGitignore.run(project);
 
   // format TypeScript
+  const formatTsConfig = await import('./format.tsconfig.js');
+  await formatTsConfig.run(project);
   const formatPrettier = await import('./format.prettier.js');
   await formatPrettier.run(project);