@deftai/directive 0.66.1 → 0.66.2

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.
Files changed (3) hide show
  1. package/dist/migrate-preflight.js +13 -12
  2. package/dist/migrate-xbrief.js +13 -10
  3. package/package.json +3 -3
package/dist/migrate-preflight.js CHANGED
@@ -1,10 +1,10 @@
1
1
  #!/usr/bin/env node
2
- import { resolve } from "node:path";
3
2
  import { fileURLToPath } from "node:url";
3
+ import { resolveFrameworkRootForProject } from "@deftai/directive-core/doctor";
4
4
  import { emitMigratePreflight, runMigratePreflight, } from "@deftai/directive-core/migrate-preflight";
5
5
  export function parseArgs(argv) {
6
6
  let projectRoot = ".";
7
- let deftRoot = resolve(import.meta.dirname, "..", "..", "..");
7
+ let explicitDeftRoot;
8
8
  let quiet = false;
9
9
  for (let i = 0; i < argv.length; i += 1) {
10
10
  const arg = argv[i] ?? "";
@@ -16,7 +16,7 @@ export function parseArgs(argv) {
16
16
  if (value === undefined) {
17
17
  return {
18
18
  projectRoot,
19
- deftRoot,
19
+ deftRoot: resolveFrameworkRootForProject(projectRoot, explicitDeftRoot),
20
20
  quiet,
21
21
  error: "argument --project-root: expected one argument",
22
22
  };
@@ -32,26 +32,27 @@ export function parseArgs(argv) {
32
32
  if (value === undefined) {
33
33
  return {
34
34
  projectRoot,
35
- deftRoot,
35
+ deftRoot: resolveFrameworkRootForProject(projectRoot, explicitDeftRoot),
36
36
  quiet,
37
37
  error: "argument --deft-root: expected one argument",
38
38
  };
39
39
  }
40
- deftRoot = value;
40
+ explicitDeftRoot = value;
41
41
  i += 1;
42
42
  }
43
43
  else if (arg.startsWith("--deft-root=")) {
44
- deftRoot = arg.slice("--deft-root=".length);
44
+ explicitDeftRoot = arg.slice("--deft-root=".length);
45
45
  }
46
46
  else {
47
- return { projectRoot, deftRoot, quiet, error: `unrecognized argument: ${arg}` };
47
+ return {
48
+ projectRoot,
49
+ deftRoot: resolveFrameworkRootForProject(projectRoot, explicitDeftRoot),
50
+ quiet,
51
+ error: `unrecognized argument: ${arg}`,
52
+ };
48
53
  }
49
54
  }
50
- if (process.env.DEFT_ROOT &&
51
- process.env.DEFT_ROOT.length > 0 &&
52
- !argv.some((a) => a.startsWith("--deft-root"))) {
53
- deftRoot = process.env.DEFT_ROOT;
54
- }
55
+ const deftRoot = resolveFrameworkRootForProject(projectRoot, explicitDeftRoot);
55
56
  return { projectRoot, deftRoot, quiet };
56
57
  }
57
58
  export function run(argv) {
package/dist/migrate-xbrief.js CHANGED
@@ -1,10 +1,10 @@
1
1
  #!/usr/bin/env node
2
- import { resolve } from "node:path";
3
2
  import { fileURLToPath } from "node:url";
3
+ import { resolveFrameworkRootForProject } from "@deftai/directive-core/doctor";
4
4
  import { runXbriefMigrationCli } from "@deftai/directive-core/xbrief-migrate";
5
5
  export function parseArgs(argv) {
6
6
  let projectRoot = ".";
7
- let frameworkRoot = resolve(import.meta.dirname, "..", "..", "..");
7
+ let explicitFrameworkRoot;
8
8
  let force = false;
9
9
  for (let i = 0; i < argv.length; i += 1) {
10
10
  const arg = argv[i] ?? "";
@@ -16,7 +16,7 @@ export function parseArgs(argv) {
16
16
  if (value === undefined) {
17
17
  return {
18
18
  projectRoot,
19
- frameworkRoot,
19
+ frameworkRoot: resolveFrameworkRootForProject(projectRoot, explicitFrameworkRoot),
20
20
  force,
21
21
  error: "argument --project-root: expected one argument",
22
22
  };
@@ -32,24 +32,27 @@ export function parseArgs(argv) {
32
32
  if (value === undefined) {
33
33
  return {
34
34
  projectRoot,
35
- frameworkRoot,
35
+ frameworkRoot: resolveFrameworkRootForProject(projectRoot, explicitFrameworkRoot),
36
36
  force,
37
37
  error: "argument --framework-root: expected one argument",
38
38
  };
39
39
  }
40
- frameworkRoot = value;
40
+ explicitFrameworkRoot = value;
41
41
  i += 1;
42
42
  }
43
43
  else if (arg.startsWith("--framework-root=")) {
44
- frameworkRoot = arg.slice("--framework-root=".length);
44
+ explicitFrameworkRoot = arg.slice("--framework-root=".length);
45
45
  }
46
46
  else {
47
- return { projectRoot, frameworkRoot, force, error: `unrecognized argument: ${arg}` };
47
+ return {
48
+ projectRoot,
49
+ frameworkRoot: resolveFrameworkRootForProject(projectRoot, explicitFrameworkRoot),
50
+ force,
51
+ error: `unrecognized argument: ${arg}`,
52
+ };
48
53
  }
49
54
  }
50
- if (process.env.DEFT_ROOT && process.env.DEFT_ROOT.length > 0) {
51
- frameworkRoot = process.env.DEFT_ROOT;
52
- }
55
+ const frameworkRoot = resolveFrameworkRootForProject(projectRoot, explicitFrameworkRoot);
53
56
  return { projectRoot, frameworkRoot, force };
54
57
  }
55
58
  export function run(argv) {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@deftai/directive",
3
- "version": "0.66.1",
3
+ "version": "0.66.2",
4
4
  "description": "Directive CLI — npm install path for the Deft Directive framework.",
5
5
  "type": "module",
6
6
  "main": "./dist/index.js",
@@ -31,8 +31,8 @@
31
31
  "provenance": true
32
32
  },
33
33
  "dependencies": {
34
- "@deftai/directive-core": "^0.66.1",
35
- "@deftai/directive-content": "^0.66.1"
34
+ "@deftai/directive-core": "^0.66.2",
35
+ "@deftai/directive-content": "^0.66.2"
36
36
  },
37
37
  "scripts": {
38
38
  "build": "tsc -b"