@schemavaults/auth-server-sdk 0.21.13 → 0.21.15

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 (16) hide show
  1. package/dist/NextjsAppDirectoryPlugin/codegen-marker.d.ts +1 -0
  2. package/dist/NextjsAppDirectoryPlugin/codegen-marker.js +5 -0
  3. package/dist/NextjsAppDirectoryPlugin/codegen-marker.js.map +1 -1
  4. package/dist/NextjsAppDirectoryPlugin/codegen.d.ts +1 -0
  5. package/dist/NextjsAppDirectoryPlugin/codegen.js +22 -6
  6. package/dist/NextjsAppDirectoryPlugin/codegen.js.map +1 -1
  7. package/dist/NextjsAppDirectoryPlugin/resolve-app-directory.d.ts +1 -1
  8. package/dist/NextjsAppDirectoryPlugin/resolve-app-directory.js +16 -3
  9. package/dist/NextjsAppDirectoryPlugin/resolve-app-directory.js.map +1 -1
  10. package/dist/NextjsAppDirectoryPlugin/resolve-codegen-templates-directory.d.ts +1 -1
  11. package/dist/NextjsAppDirectoryPlugin/resolve-codegen-templates-directory.js +17 -9
  12. package/dist/NextjsAppDirectoryPlugin/resolve-codegen-templates-directory.js.map +1 -1
  13. package/dist/cli.cjs +66 -20
  14. package/dist/cli.js +6 -1
  15. package/dist/cli.js.map +1 -1
  16. package/package.json +2 -2
package/dist/NextjsAppDirectoryPlugin/codegen-marker.d.ts CHANGED
@@ -1,3 +1,4 @@
1
1
  export declare function getCodegenMarkerComment(): string;
2
2
  export declare function hasCodegenMarker(firstLine: string): boolean;
3
+ export declare function extractVersion(firstLine: string): string | null;
3
4
  export declare function prependCodegenMarker(content: string): string;
package/dist/NextjsAppDirectoryPlugin/codegen-marker.js CHANGED
@@ -7,6 +7,11 @@ export function getCodegenMarkerComment() {
7
7
  export function hasCodegenMarker(firstLine) {
8
8
  return CODEGEN_MARKER_REGEX.test(firstLine);
9
9
  }
10
+ export function extractVersion(firstLine) {
11
+ if (!firstLine.startsWith(CODEGEN_MARKER_PREFIX))
12
+ return null;
13
+ return firstLine.slice(CODEGEN_MARKER_PREFIX.length) || null;
14
+ }
10
15
  export function prependCodegenMarker(content) {
11
16
  return `${getCodegenMarkerComment()}\n${content}`;
12
17
  }
package/dist/NextjsAppDirectoryPlugin/codegen-marker.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"codegen-marker.js","sourceRoot":"","sources":["../../src/NextjsAppDirectoryPlugin/codegen-marker.ts"],"names":[],"mappings":"AAAA,MAAM,qBAAqB,GAAG,qDAAqD,CAAC;AAEpF,MAAM,oBAAoB,GACxB,4DAA4D,CAAC;AAE/D,MAAM,UAAU,uBAAuB;IACrC,MAAM,OAAO,GAAG,OAAO,eAAe,KAAK,QAAQ,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,SAAS,CAAC;IAClF,OAAO,GAAG,qBAAqB,GAAG,OAAO,EAAE,CAAC;AAC9C,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,SAAiB;IAChD,OAAO,oBAAoB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;AAC9C,CAAC;AAED,MAAM,UAAU,oBAAoB,CAAC,OAAe;IAClD,OAAO,GAAG,uBAAuB,EAAE,KAAK,OAAO,EAAE,CAAC;AACpD,CAAC"}
1
+ {"version":3,"file":"codegen-marker.js","sourceRoot":"","sources":["../../src/NextjsAppDirectoryPlugin/codegen-marker.ts"],"names":[],"mappings":"AAAA,MAAM,qBAAqB,GAAG,qDAAqD,CAAC;AAEpF,MAAM,oBAAoB,GACxB,4DAA4D,CAAC;AAE/D,MAAM,UAAU,uBAAuB;IACrC,MAAM,OAAO,GAAG,OAAO,eAAe,KAAK,QAAQ,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,SAAS,CAAC;IAClF,OAAO,GAAG,qBAAqB,GAAG,OAAO,EAAE,CAAC;AAC9C,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,SAAiB;IAChD,OAAO,oBAAoB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;AAC9C,CAAC;AAED,MAAM,UAAU,cAAc,CAAC,SAAiB;IAC9C,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,qBAAqB,CAAC;QAAE,OAAO,IAAI,CAAC;IAC9D,OAAO,SAAS,CAAC,KAAK,CAAC,qBAAqB,CAAC,MAAM,CAAC,IAAI,IAAI,CAAC;AAC/D,CAAC;AAED,MAAM,UAAU,oBAAoB,CAAC,OAAe;IAClD,OAAO,GAAG,uBAAuB,EAAE,KAAK,OAAO,EAAE,CAAC;AACpD,CAAC"}
package/dist/NextjsAppDirectoryPlugin/codegen.d.ts CHANGED
@@ -1,4 +1,5 @@
1
1
  export interface IAuthResourceServerCodegenOptions {
2
2
  codegenTemplatesDirectory?: string;
3
+ debug?: boolean;
3
4
  }
4
5
  export default function codegen(opts?: IAuthResourceServerCodegenOptions): Promise<void>;
package/dist/NextjsAppDirectoryPlugin/codegen.js CHANGED
@@ -3,7 +3,7 @@ import { dirname } from "path";
3
3
  import resolveAppDirectory from "./resolve-app-directory";
4
4
  import { join } from "path";
5
5
  import resolveCodegenTemplatesDirectory from "./resolve-codegen-templates-directory";
6
- import { hasCodegenMarker, prependCodegenMarker } from "./codegen-marker";
6
+ import { extractVersion, getCodegenMarkerComment, hasCodegenMarker, prependCodegenMarker } from "./codegen-marker";
7
7
  const pagesToCreate = [
8
8
  {
9
9
  app_dir_path: "/auth/login",
@@ -31,12 +31,26 @@ function isCodegenManagedFile(filePath) {
31
31
  const firstLine = content.split("\n")[0] ?? "";
32
32
  return hasCodegenMarker(firstLine);
33
33
  }
34
+ function getExistingVersion(filePath) {
35
+ const content = readFileSync(filePath, { encoding: "utf-8" });
36
+ const firstLine = content.split("\n")[0] ?? "";
37
+ return extractVersion(firstLine);
38
+ }
39
+ function formatVersionTransition(oldVersion) {
40
+ const newMarker = getCodegenMarkerComment();
41
+ const newVersion = extractVersion(newMarker);
42
+ if (oldVersion && newVersion && oldVersion !== newVersion) {
43
+ return ` (${oldVersion} => ${newVersion})`;
44
+ }
45
+ return "";
46
+ }
34
47
  function createClientPages(appDirectory, templatesDir) {
35
48
  for (const page of pagesToCreate) {
36
49
  const destPath = join(appDirectory, page.app_dir_path, "page.tsx");
37
50
  const relPath = `${page.app_dir_path}/page.tsx`;
38
51
  if (existsSync(destPath)) {
39
52
  if (isCodegenManagedFile(destPath)) {
53
+ const oldVersion = getExistingVersion(destPath);
40
54
  const templatePath = join(templatesDir, page.codegen_template_path);
41
55
  const templateContent = readFileSync(templatePath, {
42
56
  encoding: "utf-8",
@@ -44,7 +58,7 @@ function createClientPages(appDirectory, templatesDir) {
44
58
  writeFileSync(destPath, prependCodegenMarker(templateContent), {
45
59
  encoding: "utf-8",
46
60
  });
47
- console.log(` - updated '${relPath}'`);
61
+ console.log(` - updated '${relPath}'${formatVersionTransition(oldVersion)}`);
48
62
  }
49
63
  else {
50
64
  console.log(` - skipping '${relPath}' (user-customized, no codegen marker)`);
@@ -68,16 +82,17 @@ function createClientPages(appDirectory, templatesDir) {
68
82
  function createClientAuthProvider(appDirectory, templatesDir) {
69
83
  const srcTemplatePath = join(templatesDir, "auth", "auth-provider.tsx");
70
84
  const destPath = join(appDirectory, "auth", "auth-provider.tsx");
71
- const relPath = "auth/auth-provider.tsx";
85
+ const relPath = "/auth/auth-provider.tsx";
72
86
  if (existsSync(destPath)) {
73
87
  if (isCodegenManagedFile(destPath)) {
88
+ const oldVersion = getExistingVersion(destPath);
74
89
  const templateContent = readFileSync(srcTemplatePath, {
75
90
  encoding: "utf-8",
76
91
  });
77
92
  writeFileSync(destPath, prependCodegenMarker(templateContent), {
78
93
  encoding: "utf-8",
79
94
  });
80
- console.log(` - updated '${relPath}'`);
95
+ console.log(` - updated '${relPath}'${formatVersionTransition(oldVersion)}`);
81
96
  }
82
97
  else {
83
98
  console.log(` - skipping '${relPath}' (user-customized, no codegen marker)`);
@@ -98,7 +113,8 @@ function createClientAuthProvider(appDirectory, templatesDir) {
98
113
  }
99
114
  export default async function codegen(opts) {
100
115
  console.log(`[@schemavaults/auth-server-sdk/NextjsAppDirectoryPlugin] Running codegen:`);
101
- const appDirectory = resolveAppDirectory();
116
+ const debug = opts?.debug ?? false;
117
+ const appDirectory = resolveAppDirectory(debug);
102
118
  console.log(` - resolved /app directory at '${appDirectory}'`);
103
119
  const authDirectory = join(appDirectory, "auth");
104
120
  if (!existsSync(authDirectory)) {
@@ -110,7 +126,7 @@ export default async function codegen(opts) {
110
126
  }
111
127
  const templatesDir = typeof opts?.codegenTemplatesDirectory === "string"
112
128
  ? opts.codegenTemplatesDirectory
113
- : resolveCodegenTemplatesDirectory();
129
+ : resolveCodegenTemplatesDirectory(debug);
114
130
  console.log(` - resolved codegen templates directory at '${templatesDir}'`);
115
131
  createClientPages(appDirectory, templatesDir);
116
132
  createClientAuthProvider(appDirectory, templatesDir);
package/dist/NextjsAppDirectoryPlugin/codegen.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"codegen.js","sourceRoot":"","sources":["../../src/NextjsAppDirectoryPlugin/codegen.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,IAAI,CAAC;AACxE,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAC/B,OAAO,mBAAmB,MAAM,yBAAyB,CAAC;AAC1D,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAC5B,OAAO,gCAAgC,MAAM,uCAAuC,CAAC;AACrF,OAAO,EAAE,gBAAgB,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAW1E,MAAM,aAAa,GAAiC;IAClD;QACE,YAAY,EAAE,aAAa;QAC3B,qBAAqB,EAAE,qBAAqB;KAC7C;IACD;QACE,YAAY,EAAE,gBAAgB;QAC9B,qBAAqB,EAAE,wBAAwB;KAChD;IACD;QACE,YAAY,EAAE,cAAc;QAC5B,qBAAqB,EAAE,sBAAsB;KAC9C;IACD;QACE,YAAY,EAAE,iBAAiB;QAC/B,qBAAqB,EAAE,yBAAyB;KACjD;IACD;QACE,YAAY,EAAE,aAAa;QAC3B,qBAAqB,EAAE,qBAAqB;KAC7C;CACF,CAAC;AAEF,SAAS,oBAAoB,CAAC,QAAgB;IAC5C,MAAM,OAAO,GAAG,YAAY,CAAC,QAAQ,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,CAAC;IAC9D,MAAM,SAAS,GAAG,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;IAC/C,OAAO,gBAAgB,CAAC,SAAS,CAAC,CAAC;AACrC,CAAC;AAED,SAAS,iBAAiB,CAAC,YAAoB,EAAE,YAAoB;IACnE,KAAK,MAAM,IAAI,IAAI,aAAa,EAAE,CAAC;QACjC,MAAM,QAAQ,GAAW,IAAI,CAAC,YAAY,EAAE,IAAI,CAAC,YAAY,EAAE,UAAU,CAAC,CAAC;QAC3E,MAAM,OAAO,GAAG,GAAG,IAAI,CAAC,YAAY,WAAW,CAAC;QAEhD,IAAI,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC;YACzB,IAAI,oBAAoB,CAAC,QAAQ,CAAC,EAAE,CAAC;gBACnC,MAAM,YAAY,GAAW,IAAI,CAAC,YAAY,EAAE,IAAI,CAAC,qBAAqB,CAAC,CAAC;gBAC5E,MAAM,eAAe,GAAW,YAAY,CAAC,YAAY,EAAE;oBACzD,QAAQ,EAAE,OAAO;iBAClB,CAAC,CAAC;gBACH,aAAa,CAAC,QAAQ,EAAE,oBAAoB,CAAC,eAAe,CAAC,EAAE;oBAC7D,QAAQ,EAAE,OAAO;iBAClB,CAAC,CAAC;gBACH,OAAO,CAAC,GAAG,CAAC,eAAe,OAAO,GAAG,CAAC,CAAC;YACzC,CAAC;iBAAM,CAAC;gBACN,OAAO,CAAC,GAAG,CACT,gBAAgB,OAAO,wCAAwC,CAChE,CAAC;YACJ,CAAC;YACD,SAAS;QACX,CAAC;QAED,MAAM,OAAO,GAAW,OAAO,CAAC,QAAQ,CAAC,CAAC;QAC1C,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,CAAC;YACzB,SAAS,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAC1C,CAAC;QAED,MAAM,YAAY,GAAW,IAAI,CAAC,YAAY,EAAE,IAAI,CAAC,qBAAqB,CAAC,CAAC;QAC5E,MAAM,eAAe,GAAW,YAAY,CAAC,YAAY,EAAE;YACzD,QAAQ,EAAE,OAAO;SAClB,CAAC,CAAC;QACH,aAAa,CAAC,QAAQ,EAAE,oBAAoB,CAAC,eAAe,CAAC,EAAE;YAC7D,QAAQ,EAAE,OAAO;SAClB,CAAC,CAAC;QACH,OAAO,CAAC,GAAG,CAAC,eAAe,OAAO,GAAG,CAAC,CAAC;IACzC,CAAC;AACH,CAAC;AAED,SAAS,wBAAwB,CAAC,YAAoB,EAAE,YAAoB;IAC1E,MAAM,eAAe,GAAW,IAAI,CAClC,YAAY,EACZ,MAAM,EACN,mBAAmB,CACpB,CAAC;IACF,MAAM,QAAQ,GAAW,IAAI,CAAC,YAAY,EAAE,MAAM,EAAE,mBAAmB,CAAC,CAAC;IACzE,MAAM,OAAO,GAAG,wBAAwB,CAAC;IAEzC,IAAI,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC;QACzB,IAAI,oBAAoB,CAAC,QAAQ,CAAC,EAAE,CAAC;YACnC,MAAM,eAAe,GAAW,YAAY,CAAC,eAAe,EAAE;gBAC5D,QAAQ,EAAE,OAAO;aAClB,CAAC,CAAC;YACH,aAAa,CAAC,QAAQ,EAAE,oBAAoB,CAAC,eAAe,CAAC,EAAE;gBAC7D,QAAQ,EAAE,OAAO;aAClB,CAAC,CAAC;YACH,OAAO,CAAC,GAAG,CAAC,eAAe,OAAO,GAAG,CAAC,CAAC;QACzC,CAAC;aAAM,CAAC;YACN,OAAO,CAAC,GAAG,CACT,gBAAgB,OAAO,wCAAwC,CAChE,CAAC;QACJ,CAAC;QACD,OAAO;IACT,CAAC;IAED,MAAM,OAAO,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;IAClC,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,CAAC;QACzB,SAAS,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IAC1C,CAAC;IAED,MAAM,eAAe,GAAW,YAAY,CAAC,eAAe,EAAE;QAC5D,QAAQ,EAAE,OAAO;KAClB,CAAC,CAAC;IACH,aAAa,CAAC,QAAQ,EAAE,oBAAoB,CAAC,eAAe,CAAC,EAAE;QAC7D,QAAQ,EAAE,OAAO;KAClB,CAAC,CAAC;IACH,OAAO,CAAC,GAAG,CAAC,eAAe,OAAO,GAAG,CAAC,CAAC;AACzC,CAAC;AAED,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,OAAO,CACnC,IAAwC;IAExC,OAAO,CAAC,GAAG,CACT,2EAA2E,CAC5E,CAAC;IAEF,MAAM,YAAY,GAAW,mBAAmB,EAAE,CAAC;IACnD,OAAO,CAAC,GAAG,CAAC,kCAAkC,YAAY,GAAG,CAAC,CAAC;IAC/D,MAAM,aAAa,GAAW,IAAI,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC;IACzD,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,EAAE,CAAC;QAC/B,SAAS,CAAC,aAAa,CAAC,CAAC;QACzB,OAAO,CAAC,GAAG,CAAC,kCAAkC,aAAa,GAAG,CAAC,CAAC;IAClE,CAAC;SAAM,CAAC;QACN,OAAO,CAAC,GAAG,CAAC,yCAAyC,aAAa,GAAG,CAAC,CAAC;IACzE,CAAC;IAED,MAAM,YAAY,GAChB,OAAO,IAAI,EAAE,yBAAyB,KAAK,QAAQ;QACjD,CAAC,CAAC,IAAI,CAAC,yBAAyB;QAChC,CAAC,CAAC,gCAAgC,EAAE,CAAC;IACzC,OAAO,CAAC,GAAG,CAAC,+CAA+C,YAAY,GAAG,CAAC,CAAC;IAE5E,iBAAiB,CAAC,YAAY,EAAE,YAAY,CAAC,CAAC;IAC9C,wBAAwB,CAAC,YAAY,EAAE,YAAY,CAAC,CAAC;IAErD,OAAO,CAAC,GAAG,CACT,4EAA4E,CAC7E,CAAC;AACJ,CAAC"}
1
+ {"version":3,"file":"codegen.js","sourceRoot":"","sources":["../../src/NextjsAppDirectoryPlugin/codegen.ts"],"names":[],"mappings":"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"}
package/dist/NextjsAppDirectoryPlugin/resolve-app-directory.d.ts CHANGED
@@ -1 +1 @@
1
- export default function resolveAppDirectory(): string;
1
+ export default function resolveAppDirectory(debug?: boolean): string;
package/dist/NextjsAppDirectoryPlugin/resolve-app-directory.js CHANGED
@@ -1,8 +1,16 @@
1
1
  import { join } from "path";
2
2
  import { existsSync } from "fs";
3
3
  import { cwd } from "process";
4
- function resolveProjectRoot() {
4
+ function resolveProjectRoot(debug) {
5
5
  const current = cwd();
6
+ if (debug) {
7
+ console.log(`[debug] resolveProjectRoot: cwd = '${current}'`);
8
+ const nextConfigVariants = ["next.config.js", "next.config.ts", "next.config.mjs", "next.config.cjs"];
9
+ console.log(`[debug] resolveProjectRoot: package.json exists = ${existsSync(join(current, "package.json"))}`);
10
+ for (const variant of nextConfigVariants) {
11
+ console.log(`[debug] resolveProjectRoot: ${variant} exists = ${existsSync(join(current, variant))}`);
12
+ }
13
+ }
6
14
  if (existsSync(join(current, "package.json")) &&
7
15
  (existsSync(join(current, "next.config.js")) ||
8
16
  existsSync(join(current, "next.config.ts")) ||
@@ -14,8 +22,13 @@ function resolveProjectRoot() {
14
22
  throw new Error("Failed to resolve package root!");
15
23
  }
16
24
  }
17
- export default function resolveAppDirectory() {
18
- const projectRoot = resolveProjectRoot();
25
+ export default function resolveAppDirectory(debug = false) {
26
+ const projectRoot = resolveProjectRoot(debug);
27
+ if (debug) {
28
+ console.log(`[debug] resolveAppDirectory: projectRoot = '${projectRoot}'`);
29
+ console.log(`[debug] resolveAppDirectory: src/app exists = ${existsSync(join(projectRoot, "src", "app"))}`);
30
+ console.log(`[debug] resolveAppDirectory: app exists = ${existsSync(join(projectRoot, "app"))}`);
31
+ }
19
32
  if (existsSync(join(projectRoot, "src", "app"))) {
20
33
  return join(projectRoot, "src", "app");
21
34
  }
package/dist/NextjsAppDirectoryPlugin/resolve-app-directory.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"resolve-app-directory.js","sourceRoot":"","sources":["../../src/NextjsAppDirectoryPlugin/resolve-app-directory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAC5B,OAAO,EAAE,UAAU,EAAE,MAAM,IAAI,CAAC;AAChC,OAAO,EAAE,GAAG,EAAE,MAAM,SAAS,CAAC;AAE9B,SAAS,kBAAkB;IACzB,MAAM,OAAO,GAAW,GAAG,EAAE,CAAC;IAC9B,IACE,UAAU,CAAC,IAAI,CAAC,OAAO,EAAE,cAAc,CAAC,CAAC;QACzC,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,EAAE,gBAAgB,CAAC,CAAC;YAC1C,UAAU,CAAC,IAAI,CAAC,OAAO,EAAE,gBAAgB,CAAC,CAAC;YAC3C,UAAU,CAAC,IAAI,CAAC,OAAO,EAAE,iBAAiB,CAAC,CAAC;YAC5C,UAAU,CAAC,IAAI,CAAC,OAAO,EAAE,iBAAiB,CAAC,CAAC,CAAC,EAC/C,CAAC;QACD,OAAO,OAAO,CAAC;IACjB,CAAC;SAAM,CAAC;QACN,MAAM,IAAI,KAAK,CAAC,iCAAiC,CAAC,CAAC;IACrD,CAAC;AACH,CAAC;AAED,MAAM,CAAC,OAAO,UAAU,mBAAmB;IACzC,MAAM,WAAW,GAAW,kBAAkB,EAAE,CAAC;IACjD,IAAI,UAAU,CAAC,IAAI,CAAC,WAAW,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC,EAAE,CAAC;QAChD,OAAO,IAAI,CAAC,WAAW,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;IACzC,CAAC;SAAM,IAAI,UAAU,CAAC,IAAI,CAAC,WAAW,EAAE,KAAK,CAAC,CAAC,EAAE,CAAC;QAChD,OAAO,IAAI,CAAC,WAAW,EAAE,KAAK,CAAC,CAAC;IAClC,CAAC;SAAM,CAAC;QACN,MAAM,IAAI,KAAK,CAAC,2CAA2C,CAAC,CAAC;IAC/D,CAAC;AACH,CAAC"}
1
+ {"version":3,"file":"resolve-app-directory.js","sourceRoot":"","sources":["../../src/NextjsAppDirectoryPlugin/resolve-app-directory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAC5B,OAAO,EAAE,UAAU,EAAE,MAAM,IAAI,CAAC;AAChC,OAAO,EAAE,GAAG,EAAE,MAAM,SAAS,CAAC;AAE9B,SAAS,kBAAkB,CAAC,KAAc;IACxC,MAAM,OAAO,GAAW,GAAG,EAAE,CAAC;IAC9B,IAAI,KAAK,EAAE,CAAC;QACV,OAAO,CAAC,GAAG,CAAC,sCAAsC,OAAO,GAAG,CAAC,CAAC;QAC9D,MAAM,kBAAkB,GAAG,CAAC,gBAAgB,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,iBAAiB,CAAC,CAAC;QACtG,OAAO,CAAC,GAAG,CAAC,qDAAqD,UAAU,CAAC,IAAI,CAAC,OAAO,EAAE,cAAc,CAAC,CAAC,EAAE,CAAC,CAAC;QAC9G,KAAK,MAAM,OAAO,IAAI,kBAAkB,EAAE,CAAC;YACzC,OAAO,CAAC,GAAG,CAAC,+BAA+B,OAAO,aAAa,UAAU,CAAC,IAAI,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC;QACvG,CAAC;IACH,CAAC;IACD,IACE,UAAU,CAAC,IAAI,CAAC,OAAO,EAAE,cAAc,CAAC,CAAC;QACzC,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,EAAE,gBAAgB,CAAC,CAAC;YAC1C,UAAU,CAAC,IAAI,CAAC,OAAO,EAAE,gBAAgB,CAAC,CAAC;YAC3C,UAAU,CAAC,IAAI,CAAC,OAAO,EAAE,iBAAiB,CAAC,CAAC;YAC5C,UAAU,CAAC,IAAI,CAAC,OAAO,EAAE,iBAAiB,CAAC,CAAC,CAAC,EAC/C,CAAC;QACD,OAAO,OAAO,CAAC;IACjB,CAAC;SAAM,CAAC;QACN,MAAM,IAAI,KAAK,CAAC,iCAAiC,CAAC,CAAC;IACrD,CAAC;AACH,CAAC;AAED,MAAM,CAAC,OAAO,UAAU,mBAAmB,CAAC,QAAiB,KAAK;IAChE,MAAM,WAAW,GAAW,kBAAkB,CAAC,KAAK,CAAC,CAAC;IACtD,IAAI,KAAK,EAAE,CAAC;QACV,OAAO,CAAC,GAAG,CAAC,+CAA+C,WAAW,GAAG,CAAC,CAAC;QAC3E,OAAO,CAAC,GAAG,CAAC,iDAAiD,UAAU,CAAC,IAAI,CAAC,WAAW,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC;QAC5G,OAAO,CAAC,GAAG,CAAC,6CAA6C,UAAU,CAAC,IAAI,CAAC,WAAW,EAAE,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC;IACnG,CAAC;IACD,IAAI,UAAU,CAAC,IAAI,CAAC,WAAW,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC,EAAE,CAAC;QAChD,OAAO,IAAI,CAAC,WAAW,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;IACzC,CAAC;SAAM,IAAI,UAAU,CAAC,IAAI,CAAC,WAAW,EAAE,KAAK,CAAC,CAAC,EAAE,CAAC;QAChD,OAAO,IAAI,CAAC,WAAW,EAAE,KAAK,CAAC,CAAC;IAClC,CAAC;SAAM,CAAC;QACN,MAAM,IAAI,KAAK,CAAC,2CAA2C,CAAC,CAAC;IAC/D,CAAC;AACH,CAAC"}
package/dist/NextjsAppDirectoryPlugin/resolve-codegen-templates-directory.d.ts CHANGED
@@ -1 +1 @@
1
- export default function resolveCodegenTemplatesDirectory(): string;
1
+ export default function resolveCodegenTemplatesDirectory(debug?: boolean): string;
package/dist/NextjsAppDirectoryPlugin/resolve-codegen-templates-directory.js CHANGED
@@ -1,20 +1,28 @@
1
1
  import { dirname, join, normalize } from "path";
2
2
  import { existsSync } from "fs";
3
- export default function resolveCodegenTemplatesDirectory() {
3
+ export default function resolveCodegenTemplatesDirectory(debug = false) {
4
4
  if (!__dirname) {
5
5
  throw new Error("The __dirname variable is not set for this file in this environment!");
6
6
  }
7
+ if (debug) {
8
+ console.log(`[debug] resolveCodegenTemplatesDirectory: __dirname = '${__dirname}'`);
9
+ }
7
10
  // Templates are copied into the dist/codegen-templates directory during build
8
11
  // ... but sometimes this runs from src/NextjsAppDirectoryPlugin/resolve-codegen-templates-directory.ts
9
12
  // ... while other times it is running from the bundled version at dist/cli.cjs
10
- if (existsSync(join(__dirname, "codegen-templates"))) {
11
- return normalize(join(__dirname, "codegen-templates"));
12
- }
13
- else if (existsSync(join(dirname(__dirname), "codegen-templates"))) {
14
- return normalize(join(dirname(__dirname), "codegen-templates"));
15
- }
16
- else if (existsSync(join(dirname(__dirname), "dist", "codegen-templates"))) {
17
- return normalize(join(dirname(__dirname), "dist", "codegen-templates"));
13
+ const candidates = [
14
+ join(__dirname, "codegen-templates"),
15
+ join(dirname(__dirname), "codegen-templates"),
16
+ join(dirname(__dirname), "dist", "codegen-templates"),
17
+ ];
18
+ for (const candidate of candidates) {
19
+ const exists = existsSync(candidate);
20
+ if (debug) {
21
+ console.log(`[debug] resolveCodegenTemplatesDirectory: '${candidate}' exists = ${exists}`);
22
+ }
23
+ if (exists) {
24
+ return normalize(candidate);
25
+ }
18
26
  }
19
27
  throw new Error("Failed to resolve 'codegen-templates' directory!");
20
28
  }
package/dist/NextjsAppDirectoryPlugin/resolve-codegen-templates-directory.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"resolve-codegen-templates-directory.js","sourceRoot":"","sources":["../../src/NextjsAppDirectoryPlugin/resolve-codegen-templates-directory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,MAAM,CAAC;AAChD,OAAO,EAAE,UAAU,EAAE,MAAM,IAAI,CAAC;AAEhC,MAAM,CAAC,OAAO,UAAU,gCAAgC;IACtD,IAAI,CAAC,SAAS,EAAE,CAAC;QACf,MAAM,IAAI,KAAK,CACb,sEAAsE,CACvE,CAAC;IACJ,CAAC;IAED,8EAA8E;IAC9E,uGAAuG;IACvG,+EAA+E;IAE/E,IAAI,UAAU,CAAC,IAAI,CAAC,SAAS,EAAE,mBAAmB,CAAC,CAAC,EAAE,CAAC;QACrD,OAAO,SAAS,CAAC,IAAI,CAAC,SAAS,EAAE,mBAAmB,CAAC,CAAC,CAAC;IACzD,CAAC;SAAM,IAAI,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,mBAAmB,CAAC,CAAC,EAAE,CAAC;QACrE,OAAO,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,mBAAmB,CAAC,CAAC,CAAC;IAClE,CAAC;SAAM,IACL,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,MAAM,EAAE,mBAAmB,CAAC,CAAC,EACjE,CAAC;QACD,OAAO,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,MAAM,EAAE,mBAAmB,CAAC,CAAC,CAAC;IAC1E,CAAC;IAED,MAAM,IAAI,KAAK,CAAC,kDAAkD,CAAC,CAAC;AACtE,CAAC"}
1
+ {"version":3,"file":"resolve-codegen-templates-directory.js","sourceRoot":"","sources":["../../src/NextjsAppDirectoryPlugin/resolve-codegen-templates-directory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,MAAM,CAAC;AAChD,OAAO,EAAE,UAAU,EAAE,MAAM,IAAI,CAAC;AAEhC,MAAM,CAAC,OAAO,UAAU,gCAAgC,CAAC,QAAiB,KAAK;IAC7E,IAAI,CAAC,SAAS,EAAE,CAAC;QACf,MAAM,IAAI,KAAK,CACb,sEAAsE,CACvE,CAAC;IACJ,CAAC;IAED,IAAI,KAAK,EAAE,CAAC;QACV,OAAO,CAAC,GAAG,CAAC,0DAA0D,SAAS,GAAG,CAAC,CAAC;IACtF,CAAC;IAED,8EAA8E;IAC9E,uGAAuG;IACvG,+EAA+E;IAE/E,MAAM,UAAU,GAAG;QACjB,IAAI,CAAC,SAAS,EAAE,mBAAmB,CAAC;QACpC,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,mBAAmB,CAAC;QAC7C,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,MAAM,EAAE,mBAAmB,CAAC;KACtD,CAAC;IAEF,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE,CAAC;QACnC,MAAM,MAAM,GAAG,UAAU,CAAC,SAAS,CAAC,CAAC;QACrC,IAAI,KAAK,EAAE,CAAC;YACV,OAAO,CAAC,GAAG,CAAC,8CAA8C,SAAS,cAAc,MAAM,EAAE,CAAC,CAAC;QAC7F,CAAC;QACD,IAAI,MAAM,EAAE,CAAC;YACX,OAAO,SAAS,CAAC,SAAS,CAAC,CAAC;QAC9B,CAAC;IACH,CAAC;IAED,MAAM,IAAI,KAAK,CAAC,kDAAkD,CAAC,CAAC;AACtE,CAAC"}
package/dist/cli.cjs CHANGED
@@ -11,16 +11,29 @@ var __export = (target, all) => {
11
11
  };
12
12
 
13
13
  // src/NextjsAppDirectoryPlugin/resolve-app-directory.ts
14
- function resolveProjectRoot() {
14
+ function resolveProjectRoot(debug) {
15
15
  const current = (0, import_process.cwd)();
16
+ if (debug) {
17
+ console.log(`[debug] resolveProjectRoot: cwd = '${current}'`);
18
+ const nextConfigVariants = ["next.config.js", "next.config.ts", "next.config.mjs", "next.config.cjs"];
19
+ console.log(`[debug] resolveProjectRoot: package.json exists = ${(0, import_fs.existsSync)((0, import_path.join)(current, "package.json"))}`);
20
+ for (const variant of nextConfigVariants) {
21
+ console.log(`[debug] resolveProjectRoot: ${variant} exists = ${(0, import_fs.existsSync)((0, import_path.join)(current, variant))}`);
22
+ }
23
+ }
16
24
  if ((0, import_fs.existsSync)((0, import_path.join)(current, "package.json")) && ((0, import_fs.existsSync)((0, import_path.join)(current, "next.config.js")) || (0, import_fs.existsSync)((0, import_path.join)(current, "next.config.ts")) || (0, import_fs.existsSync)((0, import_path.join)(current, "next.config.mjs")) || (0, import_fs.existsSync)((0, import_path.join)(current, "next.config.cjs")))) {
17
25
  return current;
18
26
  } else {
19
27
  throw new Error("Failed to resolve package root!");
20
28
  }
21
29
  }
22
- function resolveAppDirectory() {
23
- const projectRoot = resolveProjectRoot();
30
+ function resolveAppDirectory(debug = false) {
31
+ const projectRoot = resolveProjectRoot(debug);
32
+ if (debug) {
33
+ console.log(`[debug] resolveAppDirectory: projectRoot = '${projectRoot}'`);
34
+ console.log(`[debug] resolveAppDirectory: src/app exists = ${(0, import_fs.existsSync)((0, import_path.join)(projectRoot, "src", "app"))}`);
35
+ console.log(`[debug] resolveAppDirectory: app exists = ${(0, import_fs.existsSync)((0, import_path.join)(projectRoot, "app"))}`);
36
+ }
24
37
  if ((0, import_fs.existsSync)((0, import_path.join)(projectRoot, "src", "app"))) {
25
38
  return (0, import_path.join)(projectRoot, "src", "app");
26
39
  } else if ((0, import_fs.existsSync)((0, import_path.join)(projectRoot, "app"))) {
@@ -40,18 +53,28 @@ var init_resolve_app_directory = __esm({
40
53
  });
41
54
 
42
55
  // src/NextjsAppDirectoryPlugin/resolve-codegen-templates-directory.ts
43
- function resolveCodegenTemplatesDirectory() {
56
+ function resolveCodegenTemplatesDirectory(debug = false) {
44
57
  if (!__dirname) {
45
58
  throw new Error(
46
59
  "The __dirname variable is not set for this file in this environment!"
47
60
  );
48
61
  }
49
- if ((0, import_fs2.existsSync)((0, import_path2.join)(__dirname, "codegen-templates"))) {
50
- return (0, import_path2.normalize)((0, import_path2.join)(__dirname, "codegen-templates"));
51
- } else if ((0, import_fs2.existsSync)((0, import_path2.join)((0, import_path2.dirname)(__dirname), "codegen-templates"))) {
52
- return (0, import_path2.normalize)((0, import_path2.join)((0, import_path2.dirname)(__dirname), "codegen-templates"));
53
- } else if ((0, import_fs2.existsSync)((0, import_path2.join)((0, import_path2.dirname)(__dirname), "dist", "codegen-templates"))) {
54
- return (0, import_path2.normalize)((0, import_path2.join)((0, import_path2.dirname)(__dirname), "dist", "codegen-templates"));
62
+ if (debug) {
63
+ console.log(`[debug] resolveCodegenTemplatesDirectory: __dirname = '${__dirname}'`);
64
+ }
65
+ const candidates = [
66
+ (0, import_path2.join)(__dirname, "codegen-templates"),
67
+ (0, import_path2.join)((0, import_path2.dirname)(__dirname), "codegen-templates"),
68
+ (0, import_path2.join)((0, import_path2.dirname)(__dirname), "dist", "codegen-templates")
69
+ ];
70
+ for (const candidate of candidates) {
71
+ const exists = (0, import_fs2.existsSync)(candidate);
72
+ if (debug) {
73
+ console.log(`[debug] resolveCodegenTemplatesDirectory: '${candidate}' exists = ${exists}`);
74
+ }
75
+ if (exists) {
76
+ return (0, import_path2.normalize)(candidate);
77
+ }
55
78
  }
56
79
  throw new Error("Failed to resolve 'codegen-templates' directory!");
57
80
  }
@@ -66,12 +89,16 @@ var init_resolve_codegen_templates_directory = __esm({
66
89
 
67
90
  // src/NextjsAppDirectoryPlugin/codegen-marker.ts
68
91
  function getCodegenMarkerComment() {
69
- const version = true ? "0.21.13" : "unknown";
92
+ const version = true ? "0.21.15" : "unknown";
70
93
  return `${CODEGEN_MARKER_PREFIX}${version}`;
71
94
  }
72
95
  function hasCodegenMarker(firstLine) {
73
96
  return CODEGEN_MARKER_REGEX.test(firstLine);
74
97
  }
98
+ function extractVersion(firstLine) {
99
+ if (!firstLine.startsWith(CODEGEN_MARKER_PREFIX)) return null;
100
+ return firstLine.slice(CODEGEN_MARKER_PREFIX.length) || null;
101
+ }
75
102
  function prependCodegenMarker(content) {
76
103
  return `${getCodegenMarkerComment()}
77
104
  ${content}`;
@@ -95,12 +122,26 @@ function isCodegenManagedFile(filePath) {
95
122
  const firstLine = content.split("\n")[0] ?? "";
96
123
  return hasCodegenMarker(firstLine);
97
124
  }
125
+ function getExistingVersion(filePath) {
126
+ const content = (0, import_fs3.readFileSync)(filePath, { encoding: "utf-8" });
127
+ const firstLine = content.split("\n")[0] ?? "";
128
+ return extractVersion(firstLine);
129
+ }
130
+ function formatVersionTransition(oldVersion) {
131
+ const newMarker = getCodegenMarkerComment();
132
+ const newVersion = extractVersion(newMarker);
133
+ if (oldVersion && newVersion && oldVersion !== newVersion) {
134
+ return ` (${oldVersion} => ${newVersion})`;
135
+ }
136
+ return "";
137
+ }
98
138
  function createClientPages(appDirectory, templatesDir) {
99
139
  for (const page of pagesToCreate) {
100
140
  const destPath = (0, import_path4.join)(appDirectory, page.app_dir_path, "page.tsx");
101
141
  const relPath = `${page.app_dir_path}/page.tsx`;
102
142
  if ((0, import_fs3.existsSync)(destPath)) {
103
143
  if (isCodegenManagedFile(destPath)) {
144
+ const oldVersion = getExistingVersion(destPath);
104
145
  const templatePath2 = (0, import_path4.join)(templatesDir, page.codegen_template_path);
105
146
  const templateContent2 = (0, import_fs3.readFileSync)(templatePath2, {
106
147
  encoding: "utf-8"
@@ -108,7 +149,7 @@ function createClientPages(appDirectory, templatesDir) {
108
149
  (0, import_fs3.writeFileSync)(destPath, prependCodegenMarker(templateContent2), {
109
150
  encoding: "utf-8"
110
151
  });
111
- console.log(` - updated '${relPath}'`);
152
+ console.log(` - updated '${relPath}'${formatVersionTransition(oldVersion)}`);
112
153
  } else {
113
154
  console.log(
114
155
  ` - skipping '${relPath}' (user-customized, no codegen marker)`
@@ -137,16 +178,17 @@ function createClientAuthProvider(appDirectory, templatesDir) {
137
178
  "auth-provider.tsx"
138
179
  );
139
180
  const destPath = (0, import_path4.join)(appDirectory, "auth", "auth-provider.tsx");
140
- const relPath = "auth/auth-provider.tsx";
181
+ const relPath = "/auth/auth-provider.tsx";
141
182
  if ((0, import_fs3.existsSync)(destPath)) {
142
183
  if (isCodegenManagedFile(destPath)) {
184
+ const oldVersion = getExistingVersion(destPath);
143
185
  const templateContent2 = (0, import_fs3.readFileSync)(srcTemplatePath, {
144
186
  encoding: "utf-8"
145
187
  });
146
188
  (0, import_fs3.writeFileSync)(destPath, prependCodegenMarker(templateContent2), {
147
189
  encoding: "utf-8"
148
190
  });
149
- console.log(` - updated '${relPath}'`);
191
+ console.log(` - updated '${relPath}'${formatVersionTransition(oldVersion)}`);
150
192
  } else {
151
193
  console.log(
152
194
  ` - skipping '${relPath}' (user-customized, no codegen marker)`
@@ -170,7 +212,8 @@ async function codegen(opts) {
170
212
  console.log(
171
213
  `[@schemavaults/auth-server-sdk/NextjsAppDirectoryPlugin] Running codegen:`
172
214
  );
173
- const appDirectory = resolveAppDirectory();
215
+ const debug = opts?.debug ?? false;
216
+ const appDirectory = resolveAppDirectory(debug);
174
217
  console.log(` - resolved /app directory at '${appDirectory}'`);
175
218
  const authDirectory = (0, import_path4.join)(appDirectory, "auth");
176
219
  if (!(0, import_fs3.existsSync)(authDirectory)) {
@@ -179,7 +222,7 @@ async function codegen(opts) {
179
222
  } else {
180
223
  console.log(` - /auth directory already exists at '${authDirectory}'`);
181
224
  }
182
- const templatesDir = typeof opts?.codegenTemplatesDirectory === "string" ? opts.codegenTemplatesDirectory : resolveCodegenTemplatesDirectory();
225
+ const templatesDir = typeof opts?.codegenTemplatesDirectory === "string" ? opts.codegenTemplatesDirectory : resolveCodegenTemplatesDirectory(debug);
183
226
  console.log(` - resolved codegen templates directory at '${templatesDir}'`);
184
227
  createClientPages(appDirectory, templatesDir);
185
228
  createClientAuthProvider(appDirectory, templatesDir);
@@ -239,6 +282,7 @@ Commands:
239
282
 
240
283
  Options:
241
284
  --templates-dir <path> Custom codegen templates directory
285
+ --debug Enable debug logging
242
286
  --help, -h Show this help message
243
287
  --version, -v Show package name
244
288
  `;
@@ -252,7 +296,7 @@ async function main() {
252
296
  return;
253
297
  }
254
298
  if (args.includes("--version") || args.includes("-v")) {
255
- console.log(`${PACKAGE_NAME}@${"0.21.13"}`);
299
+ console.log(`${PACKAGE_NAME}@${"0.21.15"}`);
256
300
  return;
257
301
  }
258
302
  const command = args.find((arg) => !arg.startsWith("-")) ?? "codegen";
@@ -269,9 +313,11 @@ async function main() {
269
313
  printHelp();
270
314
  process.exit(1);
271
315
  }
272
- await NextjsAppDirectoryPlugin.codegen(
273
- templatesDir ? { codegenTemplatesDirectory: templatesDir } : void 0
274
- );
316
+ const debug = args.includes("--debug");
317
+ await NextjsAppDirectoryPlugin.codegen({
318
+ ...templatesDir ? { codegenTemplatesDirectory: templatesDir } : {},
319
+ debug
320
+ });
275
321
  }
276
322
  main().catch((err) => {
277
323
  console.error(err);
package/dist/cli.js CHANGED
@@ -7,6 +7,7 @@ Commands:
7
7
 
8
8
  Options:
9
9
  --templates-dir <path> Custom codegen templates directory
10
+ --debug Enable debug logging
10
11
  --help, -h Show this help message
11
12
  --version, -v Show package name
12
13
  `;
@@ -36,7 +37,11 @@ async function main() {
36
37
  printHelp();
37
38
  process.exit(1);
38
39
  }
39
- await NextjsAppDirectoryPlugin.codegen(templatesDir ? { codegenTemplatesDirectory: templatesDir } : undefined);
40
+ const debug = args.includes("--debug");
41
+ await NextjsAppDirectoryPlugin.codegen({
42
+ ...(templatesDir ? { codegenTemplatesDirectory: templatesDir } : {}),
43
+ debug,
44
+ });
40
45
  }
41
46
  main().catch((err) => {
42
47
  console.error(err);
package/dist/cli.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,wBAAwB,EAAE,MAAM,4BAA4B,CAAC;AAEtE,MAAM,YAAY,GAAG,+BAA+B,CAAC;AAErD,MAAM,SAAS,GAAG,UAAU,YAAY;;;;;;;;;CASvC,CAAC;AAEF,SAAS,SAAS;IAChB,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;AACzB,CAAC;AAED,KAAK,UAAU,IAAI;IACjB,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IAEnC,IAAI,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;QACnD,SAAS,EAAE,CAAC;QACZ,OAAO;IACT,CAAC;IAED,IAAI,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;QACtD,OAAO,CAAC,GAAG,CAAC,GAAG,YAAY,IAAI,eAAe,IAAI,SAAS,EAAE,CAAC,CAAC;QAC/D,OAAO;IACT,CAAC;IAED,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,IAAI,SAAS,CAAC;IAEtE,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;QAC1B,OAAO,CAAC,KAAK,CAAC,oBAAoB,OAAO,IAAI,CAAC,CAAC;QAC/C,SAAS,EAAE,CAAC;QACZ,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;IAED,MAAM,iBAAiB,GAAG,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC;IAC1D,MAAM,YAAY,GAChB,iBAAiB,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,iBAAiB,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IAErE,IAAI,iBAAiB,KAAK,CAAC,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC;QAC9C,OAAO,CAAC,KAAK,CAAC,mDAAmD,CAAC,CAAC;QACnE,SAAS,EAAE,CAAC;QACZ,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;IAED,MAAM,wBAAwB,CAAC,OAAO,CACpC,YAAY,CAAC,CAAC,CAAC,EAAE,yBAAyB,EAAE,YAAY,EAAE,CAAC,CAAC,CAAC,SAAS,CACvE,CAAC;AACJ,CAAC;AAED,IAAI,EAAE,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;IACnB,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IACnB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAClB,CAAC,CAAC,CAAC"}
1
+ {"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,wBAAwB,EAAE,MAAM,4BAA4B,CAAC;AAEtE,MAAM,YAAY,GAAG,+BAA+B,CAAC;AAErD,MAAM,SAAS,GAAG,UAAU,YAAY;;;;;;;;;;CAUvC,CAAC;AAEF,SAAS,SAAS;IAChB,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;AACzB,CAAC;AAED,KAAK,UAAU,IAAI;IACjB,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IAEnC,IAAI,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;QACnD,SAAS,EAAE,CAAC;QACZ,OAAO;IACT,CAAC;IAED,IAAI,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;QACtD,OAAO,CAAC,GAAG,CAAC,GAAG,YAAY,IAAI,eAAe,IAAI,SAAS,EAAE,CAAC,CAAC;QAC/D,OAAO;IACT,CAAC;IAED,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,IAAI,SAAS,CAAC;IAEtE,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;QAC1B,OAAO,CAAC,KAAK,CAAC,oBAAoB,OAAO,IAAI,CAAC,CAAC;QAC/C,SAAS,EAAE,CAAC;QACZ,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;IAED,MAAM,iBAAiB,GAAG,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC;IAC1D,MAAM,YAAY,GAChB,iBAAiB,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,iBAAiB,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IAErE,IAAI,iBAAiB,KAAK,CAAC,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC;QAC9C,OAAO,CAAC,KAAK,CAAC,mDAAmD,CAAC,CAAC;QACnE,SAAS,EAAE,CAAC;QACZ,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;IAED,MAAM,KAAK,GAAG,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;IAEvC,MAAM,wBAAwB,CAAC,OAAO,CAAC;QACrC,GAAG,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,yBAAyB,EAAE,YAAY,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACpE,KAAK;KACN,CAAC,CAAC;AACL,CAAC;AAED,IAAI,EAAE,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;IACnB,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IACnB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAClB,CAAC,CAAC,CAAC"}
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@schemavaults/auth-server-sdk",
3
3
  "description": "TypeScript SDK for building authenticated endpoints/middlewares for the Auth Server and Resource Servers",
4
- "version": "0.21.13",
4
+ "version": "0.21.15",
5
5
  "license": "UNLICENSED",
6
6
  "private": false,
7
7
  "repository": {
@@ -19,7 +19,7 @@
19
19
  "dependencies": {
20
20
  "zod": "3.25.8",
21
21
  "@schemavaults/jwt": "0.6.36",
22
- "@schemavaults/auth-common": "0.9.7",
22
+ "@schemavaults/auth-common": "0.9.8",
23
23
  "@schemavaults/app-definitions": "0.6.21"
24
24
  },
25
25
  "scripts": {