1.2.40

.gitlab-ci.yml

@@ -12,29 +12,25 @@ stages:
   - release
   - metadata
 
+before_script:
+  - pnpm install -g pnpm
+  - pnpm install -g @shipzone/npmci
+  - npmci npm prepare
+
+# ====================
+# security stage
+# ====================
 # ====================
 # security stage
 # ====================
-mirror:
-  stage: security
-  script:
-    - npmci git mirror
-  only:
-    - tags
-  tags:
-    - lossless
-    - docker
-    - notpriv
-
 auditProductionDependencies:
   image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
   stage: security
   script:
-    - npmci npm prepare
-    - npmci command npm install --production --ignore-scripts
      - npmci command npm config set registry https://registry.npmjs.org
-    - npmci command npm audit --audit-level=high --only=prod --production
+     - npmci command pnpm audit --audit-level=high --prod
   tags:
+    - lossless
     - docker
   allow_failure: true
 
@@ -42,11 +38,10 @@ auditDevDependencies:
   image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
   stage: security
   script:
-    - npmci npm prepare
-    - npmci command npm install --ignore-scripts
     - npmci command npm config set registry https://registry.npmjs.org
-    - npmci command npm audit --audit-level=high --only=dev
+    - npmci command pnpm audit --audit-level=high --dev
   tags:
+    - lossless
     - docker
   allow_failure: true
 
@@ -57,7 +52,6 @@ auditDevDependencies:
 testStable:
   stage: test
   script:
-    - npmci npm prepare
     - npmci node install stable
     - npmci npm install
     - npmci npm test
@@ -68,7 +62,6 @@ testStable:
 testBuild:
   stage: test
   script:
-    - npmci npm prepare
     - npmci node install stable
     - npmci npm install
     - npmci command npm run build
@@ -97,10 +90,9 @@ codequality:
   only:
     - tags
   script:
-    - npmci command npm install -g tslint typescript
+    - npmci command npm install -g typescript
     - npmci npm prepare
     - npmci npm install
-    - npmci command "tslint -c tslint.json ./ts/**/*.ts"
   tags:
     - lossless
     - docker
@@ -120,11 +112,9 @@ trigger:
 pages:
   stage: metadata
   script:
-    - npmci node install lts
+    - npmci node install stable
-    - npmci command npm install -g @gitzone/tsdoc
-    - npmci npm prepare
     - npmci npm install
-    - npmci command tsdoc
+    - npmci command npm run buildDocs
   tags:
     - lossless
     - docker

.vscode/launch.json

@@ -2,28 +2,10 @@
   "version": "0.2.0",
   "configurations": [
     {
-      "name": "current file",
+      "command": "npm test",
-      "type": "node",
+      "name": "Run npm test",
       "request": "launch",
-      "args": [
+      "type": "node-terminal"
-        "${relativeFile}"
-      ],
-      "runtimeArgs": ["-r", "@gitzone/tsrun"],
-      "cwd": "${workspaceRoot}",
-      "protocol": "inspector",
-      "internalConsoleOptions": "openOnSessionStart"
-    },
-    {
-      "name": "test.ts",
-      "type": "node",
-      "request": "launch",
-      "args": [
-        "test/test.ts"
-      ],
-      "runtimeArgs": ["-r", "@gitzone/tsrun"],
-      "cwd": "${workspaceRoot}",
-      "protocol": "inspector",
-      "internalConsoleOptions": "openOnSessionStart"
     }
   ]
 }

cli.child.ts

@@ -0,0 +1,4 @@
+#!/usr/bin/env node
+process.env.CLI_CALL = 'true';
+import * as cliTool from './ts/index.js';
+cliTool.runCli();

cli.ts.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
 process.env.CLI_CALL = 'true';
-await import('@gitzone/tsrun');
+
-const cliTool = await import('./ts/index.js');
+import * as tsrun from '@gitzone/tsrun';
-cliTool.runCli();
+tsrun.runPath('./cli.child.js', import.meta.url);

npmextra.json

@@ -10,7 +10,7 @@
       "githost": "gitlab.com",
       "gitscope": "gitzone",
       "gitrepo": "tsrun",
-      "shortDescription": "run typescript programs efficiently",
+      "description": "run typescript programs efficiently",
       "npmPackagename": "@gitzone/tsrun",
       "license": "MIT"
     }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gitzone/tsrun",
-  "version": "1.2.26",
+  "version": "1.2.40",
   "description": "run typescript programs efficiently",
   "main": "dist_ts/index.js",
   "typings": "dist_ts/index.d.ts",
@@ -13,21 +13,20 @@
   "scripts": {
     "test": "(tsbuild && node ./cli.js test/test.js sayhello)",
     "format": "(gitzone format)",
-    "build": "(tsbuild)"
+    "build": "(tsbuild)",
+    "buildDocs": "tsdoc"
   },
   "devDependencies": {
-    "@gitzone/tsbuild": "^2.1.43",
+    "@gitzone/tsbuild": "^2.1.63",
-    "@pushrocks/smartcli": "^3.0.14",
+    "@pushrocks/smartcli": "^4.0.6",
-    "@types/node": "^17.0.21",
+    "@types/node": "^20.2.5",
-    "node-fetch": "^3.2.2",
+    "node-fetch": "^3.3.1"
-    "tslint": "^6.1.2",
-    "tslint-config-prettier": "^1.18.0"
   },
   "dependencies": {
-    "@pushrocks/smartfile": "^9.0.6",
+    "@pushrocks/smartfile": "^10.0.7",
     "@pushrocks/smartshell": "^2.0.30",
-    "ts-node": "^10.7.0",
+    "ts-node": "^10.8.1",
-    "typescript": "4.7.0-dev.20220311"
+    "typescript": "^5.1.3"
   },
   "private": false,
   "files": [

test/test.ts

@@ -4,11 +4,11 @@ console.log(textToPost);
 const run = async () => {
   const smartcli = await import('@pushrocks/smartcli');
   const smartcliInstance = new smartcli.Smartcli();
-  console.log(process.argv)
+  console.log(process.argv);
-  smartcliInstance.addCommand('sayhello').subscribe(async argvArg => {
+  smartcliInstance.addCommand('sayhello').subscribe(async (argvArg) => {
     console.log('hello there');
-  })
+  });
   smartcliInstance.startParse();
-}
+};
 
 run();

ts/00_commitinfo_data.ts

@@ -0,0 +1,8 @@
+/**
+ * autocreated commitinfo by @pushrocks/commitinfo
+ */
+export const commitinfo = {
+  name: '@gitzone/tsrun',
+  version: '1.2.40',
+  description: 'run typescript programs efficiently'
+}

ts/index.ts

@@ -1,35 +1,42 @@
 import * as plugins from './plugins.js';
+const __dirname = plugins.path.dirname(plugins.url.fileURLToPath(import.meta.url));
 
-import { dirname } from 'path';
+export const runPath = async (pathArg: string, fromFileUrl?: string) => {
-import { fileURLToPath } from 'url';
+  pathArg = fromFileUrl
-
+    ? plugins.path.join(plugins.path.dirname(plugins.url.fileURLToPath(fromFileUrl)), pathArg)
-const __dirname = dirname(fileURLToPath(import.meta.url));
+    : pathArg;
-
-export const runPath = async (pathArg: string) => {
   await runCli(pathArg);
-}
+};
 
 export const runCli = async (pathArg?: string) => {
   // contents of argv array
   // process.argv[0] -> node Executable
   // process.argv[1] -> tsrun executable
   const relativePathToTsFile = pathArg ? pathArg : process.argv[2];
-  const absolutePathToTsFile = plugins.path.join(process.cwd(), relativePathToTsFile);
+  const absolutePathToTsFile = plugins.path.isAbsolute(relativePathToTsFile)
-  
+    ? relativePathToTsFile
-  
+    : plugins.path.join(process.cwd(), relativePathToTsFile);
-  process.argv.splice(0, 3); // this ensures transparent arguments for the child process
 
+  // we want to have command line arguments available in the child process.
+  // when we have a path sepcified through a function there is one argeument less to pay respect to.
+  // thus when pathArg is specifed -> we only splice 2
+  pathArg ? process.argv.splice(0, 2) : process.argv.splice(0, 3); // this ensures transparent arguments for the child process
 
   // lets setup things for execution
   const smartshellInstance = new plugins.smartshell.Smartshell({
-    executor: 'bash'
+    executor: 'bash',
   });
 
-  const tsNodeLoaderPath = plugins.path.join(__dirname, 'loader.js')
+  const tsNodeLoaderPath = plugins.path.join(__dirname, 'loader.js');
   // note: -> reduce on emtpy array does not work
   // thus check needed before reducing the argv array
-  smartshellInstance.exec(`node --loader ${tsNodeLoaderPath} ${absolutePathToTsFile} ${process.argv.length > 0 ? process.argv.reduce((prevArg, currentArg) => {
+  smartshellInstance.exec(
+    `node --loader ${tsNodeLoaderPath} ${absolutePathToTsFile} ${
+      process.argv.length > 0
+        ? process.argv.reduce((prevArg, currentArg) => {
             return prevArg + ' ' + currentArg;
-  }) : ''}`);
+          })
-
+        : ''
+    }`
+  );
 };

ts/loader.ts

@@ -4,17 +4,20 @@ import type { CompilerOptions } from 'typescript';
 const defaultTsNodeOptions: plugins.tsNode.CreateOptions = {
   compilerOptions: {
     lib: ['dom'],
-    target: <any>'es2020', // Script Target should be a string -> 2 is for ES2015
+    target: <any>'es2022', // Script Target should be a string -> 2 is for ES2015
     experimentalDecorators: true,
+    useDefineForClassFields: false,
     esModuleInterop: true,
     strictNullChecks: false,
-    moduleResolution: <any>'node12',
+    moduleResolution: <any>'nodenext',
     module: <any>'ESNext',
-    importsNotUsedAsValues: <any>'preserve',
+    verbatimModuleSyntax: true,
   } as CompilerOptions,
   esm: true,
   skipIgnore: true,
-  transpileOnly: true
+  transpileOnly: true,
 };
 
-export const { resolve, load, getFormat, transformSource } = plugins.tsNode.createEsmHooks(plugins.tsNode.register(defaultTsNodeOptions)) as any;
+export const { resolve, load, getFormat, transformSource } = plugins.tsNode.createEsmHooks(
+  plugins.tsNode.register(defaultTsNodeOptions)
+) as any;

ts/plugins.ts

@@ -1,15 +1,15 @@
+// node native
+import * as path from 'path';
+import * as url from 'url';
+
+export { path, url };
+
 // @pushrocks scope
 import * as smartshell from '@pushrocks/smartshell';
 
-export {
+export { smartshell };
-  smartshell
-}
 
 // third party scope
-import * as path from 'path';
 import * as tsNode from 'ts-node';
 
-export {
+export { tsNode };
-  path,
-  tsNode
-}

tsconfig.json

@@ -1,7 +1,9 @@
 {
   "compilerOptions": {
+    "experimentalDecorators": true,
+    "useDefineForClassFields": false,
+    "target": "ES2022",
     "module": "ES2022",
-    "target": "ES2020",
+    "moduleResolution": "nodenext"
-    "moduleResolution": "Node12"
   }
 }