@haibun/utils 1.16.3 → 1.17.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
File without changes
@@ -1 +1,2 @@
1
+ #!/usr/bin/env node
1
2
  export {};
@@ -1,3 +1,4 @@
1
+ #!/usr/bin/env node
1
2
  import { readdirSync, readFileSync, statSync } from 'fs';
2
3
  import { DepGraph } from 'dependency-graph';
3
4
  import { spawn } from './util/index.js';
@@ -23,10 +24,10 @@ function doWork() {
23
24
  console.info('setting up', module, graph.dependenciesOf(module).length, 'deps');
24
25
  const dest = `./modules/${module.replace(/^@haibun\//, '')}`;
25
26
  spawn(['tsc', '-b', '.'], dest);
26
- // if (graph.dependenciesOf(module).length) {
27
- // spawn(['npm', 'link', ...graph.dependenciesOf(module)], dest);
28
- // }
29
- // spawn(['npm', 'link'], dest);
27
+ if (graph.dependenciesOf(module).length) {
28
+ spawn(['npm', 'link', ...graph.dependenciesOf(module)], dest);
29
+ }
30
+ spawn(['npm', 'link'], dest);
30
31
  }
31
32
  }
32
33
  //# sourceMappingURL=postinstall.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"postinstall.js","sourceRoot":"","sources":["../src/postinstall.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,IAAI,CAAC;AACzD,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AAExC,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC;AAEhC,MAAM,KAAK,GAAG,IAAI,QAAQ,EAAE,CAAC;AAE7B,MAAM,OAAO,GAAG,WAAW,CAAC,YAAY,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,aAAa,CAAC,EAAE,CAAC;KACjE,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,CAAC;AAC7F,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC,CAAC;AAEpD,KAAK,MAAM,MAAM,IAAI,CAAC,GAAG,OAAO,CAAC,EAAE;IACjC,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,aAAa,MAAM,eAAe,EAAE,OAAO,CAAC,CAAC,CAAC;IAClF,MAAM,EAAE,GAAG,CAAC,GAAG,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,YAAY,IAAI,EAAE,CAAC,EAAE,GAAG,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,eAAe,IAAI,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,CAAC;IACrI,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,KAAK,CAAC,aAAa,CAAC,WAAW,MAAM,EAAE,EAAE,GAAG,CAAC,CAAC,CAAC;CAClE;AAED,IAAI;IACF,MAAM,EAAE,CAAC;CACV;AAAC,OAAO,CAAC,EAAE;IACV,OAAO,CAAC,KAAK,CAAC,sBAAsB,EAAE,CAAC,CAAC,CAAC;IACzC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;CACjB;AAED,SAAS,MAAM;IACb,KAAK,MAAM,MAAM,IAAI,KAAK,CAAC,YAAY,EAAE,EAAE;QACzC,OAAO,CAAC,IAAI,CAAC,YAAY,EAAE,MAAM,EAAE,KAAK,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QAChF,MAAM,IAAI,GAAG,aAAa,MAAM,CAAC,OAAO,CAAC,YAAY,EAAE,EAAE,CAAC,EAAE,CAAC;QAE7D,KAAK,CAAC,CAAC,KAAK,EAAE,IAAI,EAAE,GAAG,CAAC,EAAE,IAAI,CAAC,CAAC;QAChC,6CAA6C;QAC7C,iEAAiE;QACjE,IAAI;QACJ,gCAAgC;KACjC;AACH,CAAC"}
1
+ {"version":3,"file":"postinstall.js","sourceRoot":"","sources":["../src/postinstall.ts"],"names":[],"mappings":";AAEA,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,IAAI,CAAC;AACzD,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AAExC,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC;AAEhC,MAAM,KAAK,GAAG,IAAI,QAAQ,EAAE,CAAC;AAE7B,MAAM,OAAO,GAAG,WAAW,CAAC,YAAY,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,aAAa,CAAC,EAAE,CAAC;KACjE,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,CAAC;AAC7F,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC,CAAC;AAEpD,KAAK,MAAM,MAAM,IAAI,CAAC,GAAG,OAAO,CAAC,EAAE;IACjC,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,aAAa,MAAM,eAAe,EAAE,OAAO,CAAC,CAAC,CAAC;IAClF,MAAM,EAAE,GAAG,CAAC,GAAG,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,YAAY,IAAI,EAAE,CAAC,EAAE,GAAG,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,eAAe,IAAI,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,CAAC;IACrI,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,KAAK,CAAC,aAAa,CAAC,WAAW,MAAM,EAAE,EAAE,GAAG,CAAC,CAAC,CAAC;CAClE;AAED,IAAI;IACF,MAAM,EAAE,CAAC;CACV;AAAC,OAAO,CAAC,EAAE;IACV,OAAO,CAAC,KAAK,CAAC,sBAAsB,EAAE,CAAC,CAAC,CAAC;IACzC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;CACjB;AAED,SAAS,MAAM;IACb,KAAK,MAAM,MAAM,IAAI,KAAK,CAAC,YAAY,EAAE,EAAE;QACzC,OAAO,CAAC,IAAI,CAAC,YAAY,EAAE,MAAM,EAAE,KAAK,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QAChF,MAAM,IAAI,GAAG,aAAa,MAAM,CAAC,OAAO,CAAC,YAAY,EAAE,EAAE,CAAC,EAAE,CAAC;QAE7D,KAAK,CAAC,CAAC,KAAK,EAAE,IAAI,EAAE,GAAG,CAAC,EAAE,IAAI,CAAC,CAAC;QAChC,IAAI,KAAK,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE;YACvC,KAAK,CAAC,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,KAAK,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC;SAC/D;QACD,KAAK,CAAC,CAAC,KAAK,EAAE,MAAM,CAAC,EAAE,IAAI,CAAC,CAAC;KAC9B;AACH,CAAC"}
@@ -1,7 +1,7 @@
1
1
  #!/usr/bin/env node
2
2
  import { scaffoldHaibun } from "./scaffold.js";
3
3
  try {
4
- scaffoldHaibun('.', console.info);
4
+ await scaffoldHaibun('.', { out: console.info });
5
5
  }
6
6
  catch (e) {
7
7
  console.error(e);
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/scaffold/index.ts"],"names":[],"mappings":";AAEA,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAE/C,IAAI;IACA,cAAc,CAAC,GAAG,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;CACrC;AAAC,OAAO,CAAC,EAAE;IACR,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;CACpB"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/scaffold/index.ts"],"names":[],"mappings":";AAEA,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAE/C,IAAI;IACA,MAAM,cAAc,CAAC,GAAG,EAAE,EAAE,GAAG,EAAE,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC;CACpD;AAAC,OAAO,CAAC,EAAE;IACR,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;CACpB"}
@@ -2,9 +2,11 @@
2
2
  type Tkv = {
3
3
  [name: string]: string;
4
4
  };
5
- export declare function scaffoldHaibun(dest: string, out: typeof console.info, add?: {
5
+ export declare function scaffoldHaibun(dest: string, opts?: {
6
+ out?: typeof console.info;
6
7
  addDeps?: Tkv;
7
8
  addDevDeps?: Tkv;
8
- addDirs: string[];
9
- }): void;
9
+ addDirs?: string[];
10
+ noPrompt?: boolean;
11
+ }): Promise<void>;
10
12
  export {};
@@ -1,21 +1,28 @@
1
1
  #!/usr/bin/env node
2
+ import * as readline from 'node:readline/promises'; // This uses the promise-based APIs
3
+ import { stdin as input, stdout as output } from 'node:process';
2
4
  import { existsSync, mkdirSync, readFileSync, writeFileSync } from 'fs';
3
5
  import path from 'path';
4
6
  import { dirname } from 'path';
5
7
  import { fileURLToPath } from 'url';
8
+ import validate from 'validate-npm-package-name';
6
9
  const refDir = path.join(dirname(fileURLToPath(import.meta.url)), '..', '..');
7
- export function scaffoldHaibun(dest, out, add) {
8
- const refHaibunPackage = JSON.parse(readFileSync(path.join(refDir, 'package.json'), 'utf-8'));
10
+ export async function scaffoldHaibun(dest, opts) {
11
+ const { noPrompt, out: outIn } = opts || {};
12
+ const out = outIn || console.info;
13
+ const refHaibunPackage = JSON.parse(readFileSync(path.join(refDir, 'ref.package.json'), 'utf-8'));
9
14
  const what = {
10
15
  dependencies: {
11
16
  '@haibun/core': `${refHaibunPackage.version}`
12
17
  },
13
18
  devDependencies: ["@types/jest", "@types/node", "@typescript-eslint/eslint-plugin", "@typescript-eslint/parser", "eslint", "eslint-config-airbnb-typescript",
14
19
  "eslint-config-prettier", "eslint-plugin-import", "eslint-plugin-prefer-arrow", "eslint-plugin-prettier", "jest",
15
- "prettier", "ts-jest", "typescript"]
20
+ "prettier", "typescript"]
16
21
  .reduce((a, i) => ({ ...a, [i]: refHaibunPackage.devDependencies[i] }), {}),
17
22
  scripts: {
18
- test: 'jest --config jest.config.ts',
23
+ test: 'NODE_OPTIONS=--experimental-vm-modules jest',
24
+ "test-watch": 'NODE_OPTIONS=--experimental-vm-modules jest',
25
+ "build": "tsc",
19
26
  lint: 'lint --ext .ts ./src/',
20
27
  },
21
28
  dirs: [
@@ -32,8 +39,22 @@ export function scaffoldHaibun(dest, out, add) {
32
39
  pName = localDest.name.replace(/.*\//, '').replace(/[@]/, '_', 'g').replace(/-./g, (x) => x[1].toUpperCase());
33
40
  }
34
41
  catch (e) {
35
- throw Error('please run this command from a project folder that has a package.json file with at least a name field. {e}');
42
+ if (!noPrompt) {
43
+ const name = await readPackageName();
44
+ localDest = { name };
45
+ }
46
+ }
47
+ let error = [];
48
+ if (localDest?.type && localDest.type !== 'module') {
49
+ error.push('package.json type must be "module"');
50
+ }
51
+ if (!validate(localDest?.name).validForNewPackages) {
52
+ error.push(`${localDest?.name} is not a valid npm package name`);
36
53
  }
54
+ if (error.length > 0) {
55
+ throw Error(error.join('\n'));
56
+ }
57
+ localDest.type = 'module';
37
58
  for (const t of ['devDependencies', 'dependencies', 'scripts']) {
38
59
  if (!localDest[t]) {
39
60
  localDest[t] = {};
@@ -48,7 +69,7 @@ export function scaffoldHaibun(dest, out, add) {
48
69
  }
49
70
  }
50
71
  writeFileSync(localPackageJson, JSON.stringify(localDest, null, 2));
51
- for (const f of ['tsconfig.json', 'jest.config.ts', '.eslintrc', '.prettierrc']) {
72
+ for (const f of ['tsconfig.json', 'jest.config.js', '.eslintrc', '.prettierrc']) {
52
73
  writeIfMissing(f);
53
74
  }
54
75
  for (const d of what.dirs) {
@@ -79,6 +100,16 @@ export function scaffoldHaibun(dest, out, add) {
79
100
  out(`copied ${to}`);
80
101
  }
81
102
  }
103
+ out(`\n${localDest.name} scaffolded for Haibun.\nNext you should these commands:\n\nnpm i\nnpm run build\nnpm test\n`);
82
104
  return;
105
+ async function readPackageName() {
106
+ const rl = readline.createInterface({ input, output });
107
+ const def = process.cwd().replace(/.*\//, '');
108
+ out(`\nA package.json file is not found.`);
109
+ out(`Please hit enter for a default package name ${def},\nenter a package name (e.g. my-great-package)\nor press control-C to exit`);
110
+ const answer = await rl.question('> ');
111
+ rl.close();
112
+ return answer || def;
113
+ }
83
114
  }
84
115
  //# sourceMappingURL=scaffold.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"scaffold.js","sourceRoot":"","sources":["../../src/scaffold/scaffold.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"scaffold.js","sourceRoot":"","sources":["../../src/scaffold/scaffold.ts"],"names":[],"mappings":"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"}
@@ -12,14 +12,14 @@ afterAll(() => {
12
12
  });
13
13
  describe('scaffold', () => {
14
14
  it('throws for empty directory', async () => {
15
- expect(() => scaffoldHaibun(TMPDIR, out)).toThrow();
15
+ expect(async () => await scaffoldHaibun(TMPDIR, { out, noPrompt: true })).rejects.toThrow();
16
16
  });
17
17
  it('creates from basic', async () => {
18
18
  const haibunPackage = JSON.parse(readFileSync((path.join(process.cwd(), '..', '..', 'package.json')), 'utf-8'));
19
19
  writeFileSync(`${TMPDIR}/package.json`, JSON.stringify({ name: 'test' }));
20
- expect(() => scaffoldHaibun(TMPDIR, out)).not.toThrow();
20
+ await scaffoldHaibun(TMPDIR, { out, noPrompt: true });
21
21
  const pkg = JSON.parse(readFileSync(`${TMPDIR}/package.json`, 'utf-8'));
22
- expect(readdirSync(TMPDIR).sort()).toEqual(['package.json', 'src', 'tsconfig.json', 'jest.config.ts', '.eslintrc', '.prettierrc'].sort());
22
+ expect(readdirSync(TMPDIR).sort()).toEqual(['package.json', 'src', 'tsconfig.json', 'jest.config.js', '.eslintrc', '.prettierrc'].sort());
23
23
  expect(pkg.dependencies['@haibun/core']).toBeDefined();
24
24
  expect(pkg.devDependencies.jest).toEqual(haibunPackage.devDependencies.jest);
25
25
  expect(readdirSync(path.join(TMPDIR, 'src'))).toEqual(['lib', 'test-stepper.test.ts', 'test-stepper.ts']);
@@ -1 +1 @@
1
- {"version":3,"file":"scaffold.test.js","sourceRoot":"","sources":["../../src/scaffold/scaffold.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,IAAI,CAAC;AACjF,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAA;AAE9C,MAAM,MAAM,GAAG,4BAA4B,CAAC;AAC5C,MAAM,GAAG,GAAG,CAAC,GAAG,CAAW,EAAE,EAAE,CAAC,SAAS,CAAC;AAE1C,UAAU,CAAC,GAAG,EAAE;IACZ,MAAM,CAAC,MAAM,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;IACjD,SAAS,CAAC,MAAM,CAAC,CAAC;AACtB,CAAC,CAAC,CAAC;AACH,QAAQ,CAAC,GAAG,EAAE;IACV,MAAM,CAAC,MAAM,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;AACrD,CAAC,CAAC,CAAC;AAEH,QAAQ,CAAC,UAAU,EAAE,GAAG,EAAE;IACtB,EAAE,CAAC,4BAA4B,EAAE,KAAK,IAAI,EAAE;QACxC,MAAM,CAAC,GAAG,EAAE,CAAC,cAAc,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC;IACxD,CAAC,CAAC,CAAC;IACH,EAAE,CAAC,oBAAoB,EAAE,KAAK,IAAI,EAAE;QAChC,MAAM,aAAa,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,cAAc,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC;QAEhH,aAAa,CAAC,GAAG,MAAM,eAAe,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC;QAC1E,MAAM,CAAC,GAAG,EAAE,CAAC,cAAc,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC;QACxD,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,GAAG,MAAM,eAAe,EAAE,OAAO,CAAC,CAAC,CAAC;QACxE,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,cAAc,EAAE,KAAK,EAAE,eAAe,EAAE,gBAAgB,EAAE,WAAW,EAAE,aAAa,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;QAC1I,MAAM,CAAC,GAAG,CAAC,YAAY,CAAC,cAAc,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC;QACvD,MAAM,CAAC,GAAG,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,aAAa,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;QAC7E,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,sBAAsB,EAAE,iBAAiB,CAAC,CAAC,CAAC;QAC1G,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,cAAc,EAAE,SAAS,CAAC,CAAC,CAAC;IAC3F,CAAC,CAAC,CAAC;AACP,CAAC,CAAC,CAAC"}
1
+ {"version":3,"file":"scaffold.test.js","sourceRoot":"","sources":["../../src/scaffold/scaffold.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,IAAI,CAAC;AACjF,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAA;AAE9C,MAAM,MAAM,GAAG,4BAA4B,CAAC;AAC5C,MAAM,GAAG,GAAG,CAAC,GAAG,CAAW,EAAE,EAAE,CAAC,SAAS,CAAC;AAE1C,UAAU,CAAC,GAAG,EAAE;IACZ,MAAM,CAAC,MAAM,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;IACjD,SAAS,CAAC,MAAM,CAAC,CAAC;AACtB,CAAC,CAAC,CAAC;AACH,QAAQ,CAAC,GAAG,EAAE;IACV,MAAM,CAAC,MAAM,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;AACrD,CAAC,CAAC,CAAC;AAEH,QAAQ,CAAC,UAAU,EAAE,GAAG,EAAE;IACtB,EAAE,CAAC,4BAA4B,EAAE,KAAK,IAAI,EAAE;QACxC,MAAM,CAAC,KAAK,IAAI,EAAE,CAAC,MAAM,cAAc,CAAC,MAAM,EAAE,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;IAChG,CAAC,CAAC,CAAC;IACH,EAAE,CAAC,oBAAoB,EAAE,KAAK,IAAI,EAAE;QAChC,MAAM,aAAa,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,cAAc,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC;QAEhH,aAAa,CAAC,GAAG,MAAM,eAAe,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC;QAC1E,MAAM,cAAc,CAAC,MAAM,EAAE,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC;QACtD,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,GAAG,MAAM,eAAe,EAAE,OAAO,CAAC,CAAC,CAAC;QACxE,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,cAAc,EAAE,KAAK,EAAE,eAAe,EAAE,gBAAgB,EAAE,WAAW,EAAE,aAAa,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;QAC1I,MAAM,CAAC,GAAG,CAAC,YAAY,CAAC,cAAc,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC;QACvD,MAAM,CAAC,GAAG,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,aAAa,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;QAC7E,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,sBAAsB,EAAE,iBAAiB,CAAC,CAAC,CAAC;QAC1G,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,cAAc,EAAE,SAAS,CAAC,CAAC,CAAC;IAC3F,CAAC,CAAC,CAAC;AACP,CAAC,CAAC,CAAC"}
@@ -6,12 +6,12 @@ export function spawn(command, module = '.', show = false) {
6
6
  const { output, stdout, stderr, status, error } = spawnSync(cmd, args, { cwd: module, env: process.env });
7
7
  const errString = (error?.message || '') + (stderr?.toString() || '');
8
8
  if (errString.length > 0) {
9
- console.error(`${place}> "${errString}" status: ${status}`);
9
+ console.error(`${place}> "${output}" status: ${status}`);
10
10
  if (status !== 0) {
11
11
  throw Error(place + ': ' + (errString.substring(0, errString.indexOf('\n'))));
12
12
  }
13
13
  if (show) {
14
- console.log(`${place}> ${stdout}`);
14
+ console.log(`${place}> ${output}`);
15
15
  }
16
16
  }
17
17
  }
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/util/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAE1C,MAAM,UAAU,KAAK,CAAC,OAAiB,EAAE,SAAiB,GAAG,EAAE,OAAgB,KAAK;IAClF,MAAM,KAAK,GAAG,MAAM,KAAK,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC;IACjD,OAAO,CAAC,IAAI,CAAC,GAAG,KAAK,KAAK,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IAC/C,MAAM,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,GAAG,OAAO,CAAC;IAC/B,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,SAAS,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;IAC1G,MAAM,SAAS,GAAG,CAAC,KAAK,EAAE,OAAO,IAAI,EAAE,CAAC,GAAG,CAAC,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC;IACtE,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE;QACxB,OAAO,CAAC,KAAK,CAAC,GAAG,KAAK,MAAM,SAAS,aAAa,MAAM,EAAE,CAAC,CAAC;QAC5D,IAAI,MAAM,KAAK,CAAC,EAAE;YAChB,MAAM,KAAK,CAAC,KAAK,GAAG,IAAI,GAAG,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,EAAE,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;SAC/E;QACD,IAAI,IAAI,EAAE;YACR,OAAO,CAAC,GAAG,CAAC,GAAG,KAAK,KAAK,MAAM,EAAE,CAAC,CAAC;SACpC;KACF;AACH,CAAC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/util/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAE1C,MAAM,UAAU,KAAK,CAAC,OAAiB,EAAE,SAAiB,GAAG,EAAE,OAAgB,KAAK;IAClF,MAAM,KAAK,GAAG,MAAM,KAAK,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC;IACjD,OAAO,CAAC,IAAI,CAAC,GAAG,KAAK,KAAK,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IAC/C,MAAM,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,GAAG,OAAO,CAAC;IAC/B,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,SAAS,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;IAC1G,MAAM,SAAS,GAAG,CAAC,KAAK,EAAE,OAAO,IAAI,EAAE,CAAC,GAAG,CAAC,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC;IACtE,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE;QACxB,OAAO,CAAC,KAAK,CAAC,GAAG,KAAK,MAAM,MAAM,aAAa,MAAM,EAAE,CAAC,CAAC;QACzD,IAAI,MAAM,KAAK,CAAC,EAAE;YAChB,MAAM,KAAK,CAAC,KAAK,GAAG,IAAI,GAAG,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,EAAE,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;SAC/E;QACD,IAAI,IAAI,EAAE;YACR,OAAO,CAAC,GAAG,CAAC,GAAG,KAAK,KAAK,MAAM,EAAE,CAAC,CAAC;SACpC;KACF;AACH,CAAC"}
@@ -1 +1,2 @@
1
+ #!/usr/bin/env node
1
2
  export {};
package/build/version.js CHANGED
@@ -1,3 +1,4 @@
1
+ #!/usr/bin/env node
1
2
  import { readFileSync, writeFileSync } from 'fs';
2
3
  import { spawn } from './util/index.js';
3
4
  const [, me, version, ...extra] = process.argv;
@@ -50,29 +51,29 @@ class Versioner {
50
51
  }
51
52
  updateVersion(name, location) {
52
53
  console.info('updating', name);
53
- const pkgFile = `${location}/package.json`;
54
- const pkg = JSON.parse(readFileSync(pkgFile, 'utf-8'));
55
- pkg.version = this.version;
56
- for (const d in pkg.dependencies) {
57
- if (d.startsWith('@haibun/')) {
58
- pkg.dependencies[d] = this.version;
59
- }
60
- if (this.haibun[d]) {
61
- pkg.dependencies[d] = this.haibun[d];
62
- }
63
- }
64
- for (const d in pkg.devDependencies) {
65
- if (d.startsWith('@haibun/')) {
66
- pkg.devDependencies[d] = this.version;
54
+ if (location !== '.') {
55
+ const pkgFile = `${location}/package.json`;
56
+ const pkg = JSON.parse(readFileSync(pkgFile, 'utf-8'));
57
+ pkg.version = this.version;
58
+ for (const d in pkg.dependencies) {
59
+ if (d.startsWith('@haibun/')) {
60
+ pkg.dependencies[d] = this.version;
61
+ }
62
+ if (this.haibun[d]) {
63
+ pkg.dependencies[d] = this.haibun[d];
64
+ }
67
65
  }
68
- if (this.haibun[d]) {
69
- pkg.devDependencies[d] = this.haibun[d];
66
+ for (const d in pkg.devDependencies) {
67
+ if (d.startsWith('@haibun/')) {
68
+ pkg.devDependencies[d] = this.version;
69
+ }
70
+ if (this.haibun[d]) {
71
+ pkg.devDependencies[d] = this.haibun[d];
72
+ }
70
73
  }
71
- }
72
- writeFileSync(pkgFile, JSON.stringify(pkg, null, 2));
73
- if (location !== '.') {
74
+ writeFileSync(pkgFile, JSON.stringify(pkg, null, 2));
74
75
  try {
75
- // spawn(['npm', 'run', 'test'], location);
76
+ spawn(['npm', 'run', 'test'], location);
76
77
  }
77
78
  catch (e) {
78
79
  console.error(`npm test failed for ${name}: ${e}`);
@@ -1 +1 @@
1
- {"version":3,"file":"version.js","sourceRoot":"","sources":["../src/version.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"version.js","sourceRoot":"","sources":["../src/version.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@haibun/utils",
3
3
  "type": "module",
4
- "version": "1.16.3",
4
+ "version": "1.17.1",
5
5
  "description": "",
6
6
  "main": "index.js",
7
7
  "files": [
@@ -10,33 +10,20 @@
10
10
  ],
11
11
  "bin": {
12
12
  "scaffold": "build/scaffold/index.js",
13
- "link-packages": "build/link-packages.js"
13
+ "link-packages": "build/link-packages.js",
14
+ "postinstall": "build/postinstall.js",
15
+ "version": "build/version.js"
14
16
  },
15
17
  "scripts": {
16
- "test": "jest --config jest.config.ts",
17
- "test-watch": "jest --config jest.config.ts --watch",
18
+ "test": "jest",
19
+ "test-watch": "jest --watch",
18
20
  "build": "tsc -b tsconfig.json"
19
21
  },
20
22
  "author": "",
21
23
  "license": "ISC",
22
24
  "dependencies": {
23
- "dependency-graph": "^0.11.0"
25
+ "dependency-graph": "^0.11.0",
26
+ "validate-npm-package-name": "^5.0.0"
24
27
  },
25
- "devDependencies": {
26
- "@types/jest": "^29.2.4",
27
- "@types/node": "^18.11.14",
28
- "@typescript-eslint/eslint-plugin": "^5.48.0",
29
- "@typescript-eslint/parser": "^5.48.0",
30
- "eslint": "^8.31.0",
31
- "eslint-config-airbnb-typescript": "^17.0.0",
32
- "eslint-config-prettier": "^8.6.0",
33
- "eslint-plugin-import": "^2.22.1",
34
- "eslint-plugin-prefer-arrow": "^1.2.2",
35
- "eslint-plugin-prettier": "^4.2.1",
36
- "jest": "^29.3.1",
37
- "prettier": "^2.8.1",
38
- "ts-jest": "^29.0.3",
39
- "ts-node": "^10.9.1",
40
- "typescript": "^5.0.0-dev.20230117"
41
- }
28
+ "devDependencies": {}
42
29
  }
@@ -0,0 +1,12 @@
1
+ const config = {
2
+ roots: [
3
+ '<rootDir>/build'
4
+ ],
5
+ testMatch: [
6
+ '**/__tests__/**/*.+(ts|tsx|js)',
7
+ '**/?(*.)+(spec|test).+(ts|tsx|js)'
8
+ ],
9
+ transform: {},
10
+ }
11
+
12
+ export default config;
@@ -1,4 +1,4 @@
1
- import WTW from './WTW';
1
+ import WTW from './WTW.js';
2
2
 
3
3
  describe('test WTW lib ', () => {
4
4
  it('passes', () => {
@@ -1,6 +1,6 @@
1
1
  import { testWithDefaults } from '@haibun/core/build/lib/test/lib.js';
2
2
 
3
- import WTW from './WTW-stepper';
3
+ import WTW from './WTW-stepper.js';
4
4
 
5
5
  describe('WTW test', () => {
6
6
  it('passes', async () => {
@@ -1,7 +1,7 @@
1
1
  import { AStepper, OK, TNamed, TWorld } from '@haibun/core/build/lib/defs.js';
2
2
  import { actionNotOK } from '@haibun/core/build/lib/util/index.js';
3
3
 
4
- import WTW from './lib/WTW';
4
+ import WTW from './lib/WTW.js';
5
5
 
6
6
  class WTWStepper extends AStepper {
7
7
  setWorld(world: TWorld, steppers: AStepper[]) {
@@ -1,11 +0,0 @@
1
- /** @type {import('ts-jest/dist/types').InitialOptionsTsJest} */
2
- module.exports = {
3
- preset: 'ts-jest',
4
- testEnvironment: 'node',
5
- testPathIgnorePatterns: ['node_modules', 'build'],
6
- globals: {
7
- 'testMatch': [
8
- "<rootDir>/src/**/*.test.ts"
9
- ]
10
- }
11
- };