@cedarjs/structure 7.0.0-canary.3174 → 7.0.0-canary.3177
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.
- package/dist/index.d.ts +3 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +3 -1
- package/dist/index.js.map +1 -1
- package/dist/model/RWProject.js +2 -2
- package/dist/model/RWProject.js.map +1 -1
- package/dist/model/RWRouter.js +2 -2
- package/dist/model/RWRouter.js.map +1 -1
- package/dist/nodes.js +3 -3
- package/dist/nodes.js.map +1 -1
- package/dist/x/URL.d.ts +1 -2
- package/dist/x/URL.d.ts.map +1 -1
- package/dist/x/URL.js +1 -2
- package/dist/x/URL.js.map +1 -1
- package/dist/x/diagnostics.js +5 -5
- package/dist/x/diagnostics.js.map +1 -1
- package/dist/x/prisma.js +2 -2
- package/dist/x/prisma.js.map +1 -1
- package/package.json +2 -2
package/dist/index.d.ts
CHANGED
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
export { DiagnosticSeverity } from './x/diagnostics.js';
|
|
2
2
|
export { RWProject, RWRoute } from './model/index.js';
|
|
3
|
-
export {
|
|
3
|
+
export { URL_fromFile } from './x/URL.js';
|
|
4
|
+
/** @deprecated Use `URL_fromFile` instead. */
|
|
5
|
+
export { URL_fromFile as URL_file } from './x/URL.js';
|
|
4
6
|
import { RWProject } from './model/index.js';
|
|
5
7
|
import type { GetSeverityLabelFunction } from './x/diagnostics.js';
|
|
6
8
|
export declare function getProject(): RWProject;
|
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAA;AACvD,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAA;AACrD,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAA;AACvD,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAA;AACrD,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AACzC,8CAA8C;AAC9C,OAAO,EAAE,YAAY,IAAI,QAAQ,EAAE,MAAM,YAAY,CAAA;AACrD,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAA;AAC5C,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,oBAAoB,CAAA;AAMlE,wBAAgB,UAAU,cAEzB;AAED,wBAAsB,gBAAgB,CAAC,IAAI,CAAC,EAAE;IAC5C,gBAAgB,CAAC,EAAE,wBAAwB,CAAA;CAC5C,iBAkCA"}
|
package/dist/index.js
CHANGED
|
@@ -1,7 +1,9 @@
|
|
|
1
1
|
import { getPaths } from '@cedarjs/project-config';
|
|
2
2
|
export { DiagnosticSeverity } from './x/diagnostics.js';
|
|
3
3
|
export { RWProject, RWRoute } from './model/index.js';
|
|
4
|
-
export {
|
|
4
|
+
export { URL_fromFile } from './x/URL.js';
|
|
5
|
+
/** @deprecated Use `URL_fromFile` instead. */
|
|
6
|
+
export { URL_fromFile as URL_file } from './x/URL.js';
|
|
5
7
|
import { RWProject } from './model/index.js';
|
|
6
8
|
import { ExtendedDiagnostic_format, DiagnosticSeverity, } from './x/diagnostics.js';
|
|
7
9
|
export function getProject() {
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAA;AAElD,OAAO,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAA;AACvD,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAA;AACrD,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAA;AAElD,OAAO,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAA;AACvD,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAA;AACrD,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AACzC,8CAA8C;AAC9C,OAAO,EAAE,YAAY,IAAI,QAAQ,EAAE,MAAM,YAAY,CAAA;AACrD,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAA;AAE5C,OAAO,EACL,yBAAyB,EACzB,kBAAkB,GACnB,MAAM,oBAAoB,CAAA;AAE3B,MAAM,UAAU,UAAU;IACxB,OAAO,IAAI,SAAS,EAAE,CAAA;AACxB,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,gBAAgB,CAAC,IAEtC;IACC,MAAM,IAAI,GAAG,QAAQ,EAAE,CAAC,IAAI,CAAA;IAC5B,MAAM,OAAO,GAAG,UAAU,EAAE,CAAA;IAC5B,MAAM,UAAU,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,IAAI,EAAE,CAAA;IACzC,IAAI,CAAC;QACH,IAAI,QAAQ,GAAG,CAAC,CAAA;QAChB,IAAI,MAAM,GAAG,CAAC,CAAA;QACd,KAAK,MAAM,CAAC,IAAI,MAAM,OAAO,CAAC,kBAAkB,EAAE,EAAE,CAAC;YACnD,MAAM,GAAG,GAAG,yBAAyB,CAAC,CAAC,EAAE,UAAU,CAAC,CAAA;YACpD,OAAO,CAAC,GAAG,CAAC,KAAK,GAAG,EAAE,CAAC,CAAA;YACvB,mDAAmD;YACnD,IAAI,CAAC,CAAC,UAAU,CAAC,QAAQ,KAAK,kBAAkB,CAAC,OAAO,EAAE,CAAC;gBACzD,QAAQ,EAAE,CAAA;YACZ,CAAC;YACD,IAAI,CAAC,CAAC,UAAU,CAAC,QAAQ,KAAK,kBAAkB,CAAC,KAAK,EAAE,CAAC;gBACvD,MAAM,EAAE,CAAA;YACV,CAAC;QACH,CAAC;QAED,IAAI,QAAQ,KAAK,CAAC,IAAI,MAAM,KAAK,CAAC,EAAE,CAAC;YACnC,OAAO,CAAC,GAAG,CAAC,kDAAkD,CAAC,CAAA;QACjE,CAAC;aAAM,IAAI,MAAM,GAAG,CAAC,EAAE,CAAC;YACtB,OAAO,CAAC,KAAK,CACX,cAAc,MAAM,eAAe,QAAQ,sBAAsB,CAClE,CAAA;YACD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;QACjB,CAAC;IACH,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,IAAI,CAAC,YAAY,KAAK,EAAE,CAAC;YACvB,MAAM,CAAC,CAAA;QACT,CAAC;QAED,MAAM,IAAI,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAA;IAC5B,CAAC;AACH,CAAC"}
|
package/dist/model/RWProject.js
CHANGED
|
@@ -11,7 +11,7 @@ import { getPaths, processPagesDir, getConfigPath, getPrismaSchemas, } from '@ce
|
|
|
11
11
|
import { BaseNode } from '../nodes.js';
|
|
12
12
|
import { lazy, memo } from '../x/decorators.js';
|
|
13
13
|
import { followsDirNameConvention, isCellFileName, isLayoutFileName, globSync, } from '../x/path.js';
|
|
14
|
-
import {
|
|
14
|
+
import { URL_fromFile } from '../x/URL.js';
|
|
15
15
|
import { RWCell } from './RWCell.js';
|
|
16
16
|
import { RWComponent } from './RWComponent.js';
|
|
17
17
|
import { RWEnvHelper } from './RWEnvHelper.js';
|
|
@@ -35,7 +35,7 @@ const allFilesGlob = '/**/*.{js,jsx,ts,tsx}';
|
|
|
35
35
|
export class RWProject extends BaseNode {
|
|
36
36
|
parent = undefined;
|
|
37
37
|
get id() {
|
|
38
|
-
return
|
|
38
|
+
return URL_fromFile(this.pathHelper.base);
|
|
39
39
|
}
|
|
40
40
|
children() {
|
|
41
41
|
return [
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RWProject.js","sourceRoot":"","sources":["../../src/model/RWProject.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,EAAE,MAAM,SAAS,CAAA;AACxB,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAA;AAC3C,OAAO,IAAI,MAAM,WAAW,CAAA;AAK5B,OAAO,EACL,QAAQ,EACR,eAAe,EACf,aAAa,EACb,gBAAgB,GACjB,MAAM,yBAAyB,CAAA;AAEhC,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAA;AACtC,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,oBAAoB,CAAA;AAC/C,OAAO,EACL,wBAAwB,EACxB,cAAc,EACd,gBAAgB,EAChB,QAAQ,GACT,MAAM,cAAc,CAAA;AACrB,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"RWProject.js","sourceRoot":"","sources":["../../src/model/RWProject.ts"],"names":[],"mappings":"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"}
|
package/dist/model/RWRouter.js
CHANGED
|
@@ -12,7 +12,7 @@ import { iter } from '../x/Array.js';
|
|
|
12
12
|
import { lazy, memo } from '../x/decorators.js';
|
|
13
13
|
import { err, LocationLike_toLocation } from '../x/diagnostics.js';
|
|
14
14
|
import { DiagnosticSeverity } from '../x/diagnostics.js';
|
|
15
|
-
import {
|
|
15
|
+
import { URL_fromFile } from '../x/URL.js';
|
|
16
16
|
import { RWRoute } from './RWRoute.js';
|
|
17
17
|
/**
|
|
18
18
|
* one per Routes.js
|
|
@@ -92,7 +92,7 @@ export class RWRouter extends FileNode {
|
|
|
92
92
|
*diagnostics() {
|
|
93
93
|
if (!this.fileExists) {
|
|
94
94
|
// should we assign this error to the project? to cedar.toml?
|
|
95
|
-
const uri =
|
|
95
|
+
const uri = URL_fromFile(getConfigPath());
|
|
96
96
|
const message = `Routes.js does not exist`;
|
|
97
97
|
yield err(uri, message);
|
|
98
98
|
// TODO: add quickFix (create a simple Routes.js)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RWRouter.js","sourceRoot":"","sources":["../../src/model/RWRouter.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,KAAK,GAAG,MAAM,UAAU,CAAA;AAE/B,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAA;AAEvD,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAA;AACtC,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAA;AACtC,OAAO,EAAE,IAAI,EAAE,MAAM,eAAe,CAAA;AACpC,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,oBAAoB,CAAA;AAE/C,OAAO,EAAE,GAAG,EAAE,uBAAuB,EAAE,MAAM,qBAAqB,CAAA;AAClE,OAAO,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAA;AACxD,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"RWRouter.js","sourceRoot":"","sources":["../../src/model/RWRouter.ts"],"names":[],"mappings":"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"}
|
package/dist/nodes.js
CHANGED
|
@@ -11,7 +11,7 @@ import { lazy, memo } from './x/decorators.js';
|
|
|
11
11
|
import { basenameNoExt } from './x/path.js';
|
|
12
12
|
import { Range_create } from './x/Range.js';
|
|
13
13
|
import { createTSMSourceFile_cached } from './x/ts-morph.js';
|
|
14
|
-
import {
|
|
14
|
+
import { URL_fromFile } from './x/URL.js';
|
|
15
15
|
export class BaseNode {
|
|
16
16
|
exists = true;
|
|
17
17
|
/**
|
|
@@ -95,7 +95,7 @@ export class BaseNode {
|
|
|
95
95
|
* @param id
|
|
96
96
|
*/
|
|
97
97
|
async findNode(id) {
|
|
98
|
-
id =
|
|
98
|
+
id = URL_fromFile(id);
|
|
99
99
|
if (this.id === id) {
|
|
100
100
|
return this;
|
|
101
101
|
}
|
|
@@ -128,7 +128,7 @@ __decorate([
|
|
|
128
128
|
], BaseNode.prototype, "findNode", null);
|
|
129
129
|
export class FileNode extends BaseNode {
|
|
130
130
|
get uri() {
|
|
131
|
-
return
|
|
131
|
+
return URL_fromFile(this.filePath);
|
|
132
132
|
}
|
|
133
133
|
/**
|
|
134
134
|
* the ID of a FileNode is its file:// uri.
|
package/dist/nodes.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"nodes.js","sourceRoot":"","sources":["../src/nodes.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,SAAS,CAAA;AAClD,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAA;AAIpC,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAA;AAElD,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,mBAAmB,CAAA;AAE9C,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAA;AAC3C,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAA;AAC3C,OAAO,EAAE,0BAA0B,EAAE,MAAM,iBAAiB,CAAA;AAC5D,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"nodes.js","sourceRoot":"","sources":["../src/nodes.ts"],"names":[],"mappings":"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"}
|
package/dist/x/URL.d.ts
CHANGED
|
@@ -2,10 +2,9 @@
|
|
|
2
2
|
* Creates a file:// URL
|
|
3
3
|
* Works with linux and windows paths
|
|
4
4
|
* If the passed in value is already as file:// URL, it returns that same value
|
|
5
|
-
* TODO: rename to URL_fromFile
|
|
6
5
|
* @param filePath
|
|
7
6
|
*/
|
|
8
|
-
export declare function
|
|
7
|
+
export declare function URL_fromFile(filePath: string, ...parts: string[]): string;
|
|
9
8
|
/**
|
|
10
9
|
*
|
|
11
10
|
* @param uriOrFilePath
|
package/dist/x/URL.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"URL.d.ts","sourceRoot":"","sources":["../../src/x/URL.ts"],"names":[],"mappings":"AAEA
|
|
1
|
+
{"version":3,"file":"URL.d.ts","sourceRoot":"","sources":["../../src/x/URL.ts"],"names":[],"mappings":"AAEA;;;;;GAKG;AACH,wBAAgB,YAAY,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,KAAK,EAAE,MAAM,EAAE,GAAG,MAAM,CAQzE;AAED;;;;GAIG;AACH,wBAAgB,UAAU,CAAC,aAAa,EAAE,MAAM,EAAE,GAAG,aAAW,GAAG,MAAM,CAYxE"}
|
package/dist/x/URL.js
CHANGED
|
@@ -3,10 +3,9 @@ import { isAbsolute, join, normalize, sep as path_sep } from 'node:path';
|
|
|
3
3
|
* Creates a file:// URL
|
|
4
4
|
* Works with linux and windows paths
|
|
5
5
|
* If the passed in value is already as file:// URL, it returns that same value
|
|
6
|
-
* TODO: rename to URL_fromFile
|
|
7
6
|
* @param filePath
|
|
8
7
|
*/
|
|
9
|
-
export function
|
|
8
|
+
export function URL_fromFile(filePath, ...parts) {
|
|
10
9
|
if (filePath.startsWith(FILE_SCHEME)) {
|
|
11
10
|
filePath = filePath.substr(FILE_SCHEME.length);
|
|
12
11
|
}
|
package/dist/x/URL.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"URL.js","sourceRoot":"","sources":["../../src/x/URL.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,IAAI,QAAQ,EAAE,MAAM,WAAW,CAAA;AAExE
|
|
1
|
+
{"version":3,"file":"URL.js","sourceRoot":"","sources":["../../src/x/URL.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,IAAI,QAAQ,EAAE,MAAM,WAAW,CAAA;AAExE;;;;;GAKG;AACH,MAAM,UAAU,YAAY,CAAC,QAAgB,EAAE,GAAG,KAAe;IAC/D,IAAI,QAAQ,CAAC,UAAU,CAAC,WAAW,CAAC,EAAE,CAAC;QACrC,QAAQ,GAAG,QAAQ,CAAC,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,CAAA;IAChD,CAAC;IACD,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACrB,QAAQ,GAAG,IAAI,CAAC,QAAQ,EAAE,GAAG,KAAK,CAAC,CAAA;IACrC,CAAC;IACD,OAAO,IAAI,GAAG,CAAC,WAAW,GAAG,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAA;AACxD,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,UAAU,CAAC,aAAqB,EAAE,GAAG,GAAG,QAAQ;IAC9D,IAAI,OAAO,aAAa,KAAK,QAAQ,EAAE,CAAC;QACtC,MAAM,IAAI,KAAK,CAAC,WAAW,CAAC,CAAA;IAC9B,CAAC;IACD,IAAI,aAAa,CAAC,UAAU,CAAC,WAAW,CAAC,EAAE,CAAC;QAC1C,OAAO,aAAa,CAAC,aAAa,EAAE,GAAG,CAAC,CAAA;IAC1C,CAAC;IACD,MAAM,CAAC,GAAG,SAAS,CAAC,aAAa,CAAC,CAAA;IAClC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,CAAC;QACnB,MAAM,IAAI,KAAK,CAAC,0BAA0B,GAAG,CAAC,CAAC,CAAA;IACjD,CAAC;IACD,OAAO,CAAC,CAAA;AACV,CAAC;AAED,MAAM,WAAW,GAAG,SAAS,CAAA;AAE7B;;;;;;;;GAQG;AACH,SAAS,aAAa,CAAC,GAAW,EAAE,GAAG,GAAG,QAAQ;IAChD,IACE,OAAO,GAAG,KAAK,QAAQ;QACvB,GAAG,CAAC,MAAM,IAAI,CAAC;QACf,CAAC,GAAG,CAAC,UAAU,CAAC,WAAW,CAAC,EAC5B,CAAC;QACD,MAAM,IAAI,SAAS,CAAC,sDAAsD,CAAC,CAAA;IAC7E,CAAC;IAED,MAAM,IAAI,GAAG,kBAAkB,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAA;IACjD,MAAM,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAA;IACpC,IAAI,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,EAAE,UAAU,CAAC,CAAA;IACxC,IAAI,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,UAAU,GAAG,CAAC,CAAC,CAAA;IAEzC,wBAAwB;IACxB,uEAAuE;IACvE,oEAAoE;IACpE,sBAAsB;IACtB,IAAI,IAAI,KAAK,WAAW,EAAE,CAAC;QACzB,IAAI,GAAG,EAAE,CAAA;IACX,CAAC;IACD,IAAI,IAAI,EAAE,CAAC;QACT,IAAI,GAAG,GAAG,GAAG,GAAG,GAAG,IAAI,CAAA;IACzB,CAAC;IAED,6DAA6D;IAC7D,uEAAuE;IACvE,gEAAgE;IAChE,oEAAoE;IACpE,+DAA+D;IAC/D,mEAAmE;IACnE,2DAA2D;IAC3D,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,KAAK,CAAC,CAAA;IAErC,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;IAE7B,8CAA8C;IAC9C,mCAAmC;IACnC,oDAAoD;IACpD,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;QAC5B,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC,CAAA;IACnB,CAAC;IAED,OAAO,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;AACxB,CAAC"}
|
package/dist/x/diagnostics.js
CHANGED
|
@@ -6,7 +6,7 @@ import * as tsm from 'ts-morph';
|
|
|
6
6
|
import { Location_is } from './Location.js';
|
|
7
7
|
import { Position_compare } from './Position.js';
|
|
8
8
|
import { Range_create } from './Range.js';
|
|
9
|
-
import {
|
|
9
|
+
import { URL_fromFile } from './URL.js';
|
|
10
10
|
export var DiagnosticSeverity;
|
|
11
11
|
(function (DiagnosticSeverity) {
|
|
12
12
|
DiagnosticSeverity[DiagnosticSeverity["Error"] = 1] = "Error";
|
|
@@ -67,12 +67,12 @@ export function Range_fromNode(node) {
|
|
|
67
67
|
}
|
|
68
68
|
export function Location_fromNode(node) {
|
|
69
69
|
return {
|
|
70
|
-
uri:
|
|
70
|
+
uri: URL_fromFile(node.getSourceFile().getFilePath()),
|
|
71
71
|
range: Range_fromNode(node),
|
|
72
72
|
};
|
|
73
73
|
}
|
|
74
74
|
export function Location_fromFilePath(filePath) {
|
|
75
|
-
return { uri:
|
|
75
|
+
return { uri: URL_fromFile(filePath), range: Range_create(0, 0, 0, 0) };
|
|
76
76
|
}
|
|
77
77
|
/**
|
|
78
78
|
* returns vscode-terminal-friendly (clickable) link with line/column information
|
|
@@ -94,7 +94,7 @@ export function LocationLike_toHashLink(loc) {
|
|
|
94
94
|
}
|
|
95
95
|
export function LocationLike_toLocation(x) {
|
|
96
96
|
if (typeof x === 'string') {
|
|
97
|
-
return { uri:
|
|
97
|
+
return { uri: URL_fromFile(x), range: Range_create(0, 0, 0, 0) };
|
|
98
98
|
}
|
|
99
99
|
if (typeof x === 'object') {
|
|
100
100
|
if (x instanceof tsm.Node) {
|
|
@@ -207,7 +207,7 @@ export function ExtendedDiagnostic_format(d, opts) {
|
|
|
207
207
|
const getSeverityLabel = opts?.getSeverityLabel ?? DiagnosticSeverity_getLabel;
|
|
208
208
|
let base = 'file://';
|
|
209
209
|
if (cwd) {
|
|
210
|
-
base =
|
|
210
|
+
base = URL_fromFile(cwd);
|
|
211
211
|
}
|
|
212
212
|
if (!base.endsWith('/')) {
|
|
213
213
|
base += '/';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"diagnostics.js","sourceRoot":"","sources":["../../src/x/diagnostics.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,aAAa,CAAA;AAC5B,OAAO,OAAO,MAAM,mBAAmB,CAAA;AACvC,OAAO,SAAS,MAAM,qBAAqB,CAAA;AAC3C,OAAO,MAAM,MAAM,kBAAkB,CAAA;AACrC,OAAO,KAAK,GAAG,MAAM,UAAU,CAAA;AAG/B,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAA;AAE3C,OAAO,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAA;AAEhD,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AACzC,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"diagnostics.js","sourceRoot":"","sources":["../../src/x/diagnostics.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,aAAa,CAAA;AAC5B,OAAO,OAAO,MAAM,mBAAmB,CAAA;AACvC,OAAO,SAAS,MAAM,qBAAqB,CAAA;AAC3C,OAAO,MAAM,MAAM,kBAAkB,CAAA;AACrC,OAAO,KAAK,GAAG,MAAM,UAAU,CAAA;AAG/B,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAA;AAE3C,OAAO,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAA;AAEhD,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AACzC,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAA;AAIvC,MAAM,CAAN,IAAY,kBAKX;AALD,WAAY,kBAAkB;IAC5B,6DAAS,CAAA;IACT,iEAAW,CAAA;IACX,yEAAe,CAAA;IACf,2DAAQ,CAAA;AACV,CAAC,EALW,kBAAkB,KAAlB,kBAAkB,QAK7B;AAUD,MAAM,UAAU,aAAa,CAAC,KAAU;IACtC,MAAM,SAAS,GAAG,KAAmB,CAAA;IACrC,OAAO,CACL,SAAS;QACT,OAAO,SAAS,CAAC,OAAO,KAAK,QAAQ;QACrC,OAAO,SAAS,CAAC,KAAK,KAAK,QAAQ;QACnC,SAAS,CAAC,KAAK,CAAC,KAAK,KAAK,SAAS;QACnC,SAAS,CAAC,KAAK,CAAC,GAAG,KAAK,SAAS,CAClC,CAAA;AACH,CAAC;AAWD,MAAM,UAAU,cAAc,CAAC,KAAY,EAAE,GAAa;IACxD,IAAI,gBAAgB,CAAC,KAAK,CAAC,KAAK,EAAE,GAAG,CAAC,KAAK,SAAS,EAAE,CAAC;QACrD,OAAO,KAAK,CAAA;IACd,CAAC;IACD,IAAI,gBAAgB,CAAC,KAAK,CAAC,GAAG,EAAE,GAAG,CAAC,KAAK,SAAS,EAAE,CAAC;QACnD,OAAO,KAAK,CAAA;IACd,CAAC;IACD,OAAO,IAAI,CAAA;AACb,CAAC;AAED,MAAM,UAAU,cAAc,CAC5B,MAAa,EACb,MAAa,EACb,YAAqB;IAErB,IAAI,YAAY,EAAE,CAAC;QACjB,IAAI,YAAY,CAAC,MAAM,CAAC,IAAI,YAAY,CAAC,MAAM,CAAC,EAAE,CAAC;YACjD,OAAO,IAAI,CAAA;QACb,CAAC;IACH,CAAC;IACD,MAAM,EAAE,KAAK,EAAE,GAAG,EAAE,GAAG,MAAM,CAAA;IAC7B,IAAI,cAAc,CAAC,MAAM,EAAE,KAAK,CAAC,EAAE,CAAC;QAClC,OAAO,IAAI,CAAA;IACb,CAAC;IACD,IAAI,cAAc,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,CAAC;QAChC,OAAO,IAAI,CAAA;IACb,CAAC;IACD,OAAO,IAAI,CAAA;AACb,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,UAAU,kBAAkB,CAChC,GAAa,EACb,SAAS,GAAG,CAAC,EACb,cAAc,GAAG,CAAC;IAElB,OAAO;QACL,IAAI,EAAE,GAAG,CAAC,IAAI,GAAG,SAAS;QAC1B,SAAS,EAAE,GAAG,CAAC,SAAS,GAAG,cAAc;KAC1C,CAAA;AACH,CAAC;AAED,MAAM,UAAU,cAAc,CAAC,IAAc;IAC3C,MAAM,KAAK,GAAG,0BAA0B,CACtC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,EACpB,IAAI,CAAC,aAAa,EAAE,CACrB,CAAA;IACD,MAAM,GAAG,GAAG,0BAA0B,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,IAAI,CAAC,aAAa,EAAE,CAAC,CAAA;IAC3E,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,CAAA;AACvB,CAAC;AAED,MAAM,UAAU,iBAAiB,CAAC,IAAc;IAC9C,OAAO;QACL,GAAG,EAAE,YAAY,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC,WAAW,EAAE,CAAC;QACrD,KAAK,EAAE,cAAc,CAAC,IAAI,CAAC;KAC5B,CAAA;AACH,CAAC;AAED,MAAM,UAAU,qBAAqB,CAAC,QAAgB;IACpD,OAAO,EAAE,GAAG,EAAE,YAAY,CAAC,QAAQ,CAAC,EAAE,KAAK,EAAE,YAAY,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,CAAA;AACzE,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,2BAA2B,CAAC,GAAiB;IAC3D,MAAM,EACJ,GAAG,EACH,KAAK,EAAE,EACL,KAAK,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,GAC3B,GACF,GAAG,uBAAuB,CAAC,GAAG,CAAC,CAAA;IAChC,OAAO,GAAG,GAAG,IAAI,IAAI,GAAG,CAAC,IAAI,SAAS,GAAG,CAAC,EAAE,CAAA;AAC9C,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,uBAAuB,CAAC,GAAiB;IACvD,MAAM,EACJ,GAAG,EACH,KAAK,EAAE,EACL,KAAK,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,GAC3B,GACF,GAAG,uBAAuB,CAAC,GAAG,CAAC,CAAA;IAChC,OAAO,GAAG,GAAG,IAAI,IAAI,GAAG,CAAC,IAAI,SAAS,GAAG,CAAC,EAAE,CAAA;AAC9C,CAAC;AAID,MAAM,UAAU,uBAAuB,CAAC,CAAe;IACrD,IAAI,OAAO,CAAC,KAAK,QAAQ,EAAE,CAAC;QAC1B,OAAO,EAAE,GAAG,EAAE,YAAY,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,YAAY,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,CAAA;IAClE,CAAC;IACD,IAAI,OAAO,CAAC,KAAK,QAAQ,EAAE,CAAC;QAC1B,IAAI,CAAC,YAAY,GAAG,CAAC,IAAI,EAAE,CAAC;YAC1B,OAAO,iBAAiB,CAAC,CAAC,CAAC,CAAA;QAC7B,CAAC;QACD,IAAI,WAAW,CAAC,CAAC,CAAC,EAAE,CAAC;YACnB,OAAO,CAAC,CAAA;QACV,CAAC;QACD,IAAI,qBAAqB,CAAC,CAAC,CAAC,EAAE,CAAC;YAC7B,OAAO,EAAE,GAAG,EAAE,CAAC,CAAC,GAAG,EAAE,KAAK,EAAE,CAAC,CAAC,UAAU,CAAC,KAAK,EAAE,CAAA;QAClD,CAAC;IACH,CAAC;IACD,MAAM,IAAI,KAAK,EAAE,CAAA;AACnB,CAAC;AAED,MAAM,UAAU,iBAAiB,CAC/B,IAAc,EACd,IAAc,EACd,YAAY,GAAG,KAAK;IAEpB,IAAI,IAAI,CAAC,GAAG,KAAK,IAAI,CAAC,GAAG,EAAE,CAAC;QAC1B,OAAO,KAAK,CAAA;IACd,CAAC;IACD,OAAO,cAAc,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,YAAY,CAAC,CAAA;AAC7D,CAAC;AAED;;;GAGG;AACH,SAAS,YAAY,CAAC,KAAY;IAChC,MAAM,EAAE,KAAK,EAAE,GAAG,EAAE,GAAG,KAAK,CAAA;IAC5B,OAAO,aAAa,CAAC,KAAK,CAAC,IAAI,aAAa,CAAC,GAAG,CAAC,CAAA;AACnD,CAAC;AAED,SAAS,aAAa,CAAC,GAAa;IAClC,OAAO,GAAG,CAAC,SAAS,KAAK,CAAC,IAAI,GAAG,CAAC,IAAI,KAAK,CAAC,CAAA;AAC9C,CAAC;AAED,MAAM,UAAU,qBAAqB,CAAC,CAAM;IAC1C,IAAI,OAAO,CAAC,KAAK,QAAQ,EAAE,CAAC;QAC1B,OAAO,KAAK,CAAA;IACd,CAAC;IACD,IAAI,OAAO,CAAC,KAAK,WAAW,EAAE,CAAC;QAC7B,OAAO,KAAK,CAAA;IACd,CAAC;IACD,IAAI,OAAO,CAAC,CAAC,GAAG,KAAK,QAAQ,EAAE,CAAC;QAC9B,OAAO,KAAK,CAAA;IACd,CAAC;IACD,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,UAAU,CAAC,EAAE,CAAC;QACjC,OAAO,KAAK,CAAA;IACd,CAAC;IACD,OAAO,IAAI,CAAA;AACb,CAAC;AAED,MAAM,UAAU,6BAA6B,CAAC,EAAwB;IAGpE,MAAM,OAAO,GAAG,OAAO,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAA;IACzC,MAAM,GAAG,GAAG,SAAS,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,EAAE;QACrC,MAAM,EAAE,GAAG,GAAG,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,UAAU,CAAC,CAAA;QACzC,OAAO,MAAM,CAAC,EAAE,EAAE,IAAI,CAAC,SAAS,CAAC,CAAA,CAAC,SAAS;IAC7C,CAAC,CAAC,CAAA;IACF,OAAO,GAAG,CAAA;AACZ,CAAC;AAED,MAAM,UAAU,0BAA0B,CACxC,MAAc,EACd,EAAkB;IAElB,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,qBAAqB,CAAC,MAAM,CAAC,CAAA;IACzD,OAAO,EAAE,SAAS,EAAE,MAAM,GAAG,CAAC,EAAE,IAAI,EAAE,IAAI,GAAG,CAAC,EAAE,CAAA;AAClD,CAAC;AAED,MAAM,UAAU,mBAAmB,CACjC,MAAc,EACd,IAAY;IAEZ,MAAM,GAAG,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC,CAAA;IACtC,IAAI,CAAC,GAAG,EAAE,CAAC;QACT,OAAO,SAAS,CAAA;IAClB,CAAC;IACD,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,GAAG,CAAA;IACzB,OAAO,EAAE,SAAS,EAAE,GAAG,GAAG,CAAC,EAAE,IAAI,EAAE,IAAI,GAAG,CAAC,EAAE,CAAA;AAC/C,CAAC;AAED,MAAM,UAAU,yBAAyB,CACvC,MAAc,EACd,IAAY;IAEZ,MAAM,CAAC,GAAG,mBAAmB,CAAC,MAAM,EAAE,IAAI,CAAC,CAAA;IAC3C,IAAI,CAAC,CAAC,EAAE,CAAC;QACP,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAA;IAC9C,CAAC;IACD,OAAO,CAAC,CAAA;AACV,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,GAAG,CACjB,GAAiB,EACjB,OAAe,EACf,IAAsB;IAEtB,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,uBAAuB,CAAC,GAAG,CAAC,CAAA;IACnD,OAAO;QACL,GAAG;QACH,UAAU,EAAE;YACV,KAAK;YACL,OAAO;YACP,QAAQ,EAAE,kBAAkB,CAAC,KAAK;YAClC,IAAI;SACL;KACF,CAAA;AACH,CAAC;AAED,SAAS,2BAA2B,CAAC,QAA6B;IAChE,MAAM,EAAE,WAAW,EAAE,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,kBAAkB,CAAA;IAChE,MAAM,MAAM,GAAG;QACb,CAAC,WAAW,CAAC,EAAE,MAAM;QACrB,CAAC,KAAK,CAAC,EAAE,OAAO;QAChB,CAAC,IAAI,CAAC,EAAE,MAAM;QACd,CAAC,OAAO,CAAC,EAAE,SAAS;KACrB,CAAA;IACD,OAAO,MAAM,CAAC,QAAQ,IAAI,WAAW,CAAC,CAAA;AACxC,CAAC;AASD;;;;;GAKG;AACH,MAAM,UAAU,yBAAyB,CACvC,CAAqB,EACrB,IAAmC;IAEnC,MAAM,EACJ,UAAU,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAE,IAAI,EAAE,GACxC,GAAG,CAAC,CAAA;IACL,MAAM,GAAG,GAAG,IAAI,EAAE,GAAG,CAAA;IACrB,MAAM,gBAAgB,GAAG,IAAI,EAAE,gBAAgB,IAAI,2BAA2B,CAAA;IAE9E,IAAI,IAAI,GAAG,SAAS,CAAA;IACpB,IAAI,GAAG,EAAE,CAAC;QACR,IAAI,GAAG,YAAY,CAAC,GAAG,CAAC,CAAA;IAC1B,CAAC;IACD,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;QACxB,IAAI,IAAI,GAAG,CAAA;IACb,CAAC;IACD,MAAM,IAAI,GAAG,2BAA2B,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;IAE/D,MAAM,aAAa,GAAG,gBAAgB,CAAC,QAAQ,CAAC,CAAA;IAEhD,MAAM,SAAS,GAAG,IAAI,CAAC,CAAC,CAAC,KAAK,IAAI,GAAG,CAAC,CAAC,CAAC,EAAE,CAAA;IAE1C,MAAM,GAAG,GAAG,GAAG,IAAI,KAAK,aAAa,GAAG,SAAS,KAAK,OAAO,EAAE,CAAA;IAC/D,OAAO,GAAG,CAAA;AACZ,CAAC"}
|
package/dist/x/prisma.js
CHANGED
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
import { existsSync, readFileSync } from 'node:fs';
|
|
2
2
|
import { Position_fromOffsetOrFail } from './diagnostics.js';
|
|
3
3
|
import { Range_create } from './Range.js';
|
|
4
|
-
import {
|
|
4
|
+
import { URL_fromFile, URL_toFile } from './URL.js';
|
|
5
5
|
/**
|
|
6
6
|
* find "env()" expressions in a prisma file using regex
|
|
7
7
|
* @param prismaSchemaFilePath
|
|
8
8
|
*/
|
|
9
9
|
export function* prisma_parseEnvExpressionsInFile(prismaSchemaFilePath) {
|
|
10
|
-
const uri =
|
|
10
|
+
const uri = URL_fromFile(prismaSchemaFilePath);
|
|
11
11
|
const file = URL_toFile(uri); // convert back and forth in case someone passed a uri
|
|
12
12
|
if (!existsSync(file)) {
|
|
13
13
|
return [];
|
package/dist/x/prisma.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prisma.js","sourceRoot":"","sources":["../../src/x/prisma.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,SAAS,CAAA;AAElD,OAAO,EAAE,yBAAyB,EAAE,MAAM,kBAAkB,CAAA;AAE5D,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AACzC,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"prisma.js","sourceRoot":"","sources":["../../src/x/prisma.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,SAAS,CAAA;AAElD,OAAO,EAAE,yBAAyB,EAAE,MAAM,kBAAkB,CAAA;AAE5D,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AACzC,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,UAAU,CAAA;AAEnD;;;GAGG;AACH,MAAM,SAAS,CAAC,CAAC,gCAAgC,CAC/C,oBAA4B;IAE5B,MAAM,GAAG,GAAG,YAAY,CAAC,oBAAoB,CAAC,CAAA;IAC9C,MAAM,IAAI,GAAG,UAAU,CAAC,GAAG,CAAC,CAAA,CAAC,sDAAsD;IACnF,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC;QACtB,OAAO,EAAE,CAAA;IACX,CAAC,CAAC,gBAAgB;IAClB,MAAM,GAAG,GAAG,YAAY,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,CAAA;IACzC,MAAM,KAAK,GAAG,0BAA0B,CAAC,GAAG,CAAC,CAAA;IAC7C,KAAK,MAAM,EAAE,KAAK,EAAE,GAAG,EAAE,IAAI,KAAK,EAAE,CAAC;QACnC,MAAM,QAAQ,GAAa,EAAE,GAAG,EAAE,KAAK,EAAE,CAAA;QACzC,MAAM,EAAE,QAAQ,EAAE,GAAG,EAAE,CAAA;IACzB,CAAC;AACH,CAAC;AAED;;;GAGG;AACH,MAAM,SAAS,CAAC,CAAC,0BAA0B,CAAC,GAAW;IACrD,MAAM,EAAE,GAAG,kBAAkB,CAAA;IAC7B,KAAK,MAAM,KAAK,IAAK,GAAW,CAAC,QAAQ,CAAC,EAAE,CAAC,EAAE,CAAC;QAC9C,IAAI,CAAC;YACH,MAAM,KAAK,GAAG,yBAAyB,CAAC,KAAK,CAAC,KAAK,EAAE,GAAG,CAAC,CAAA;YACzD,MAAM,GAAG,GAAG,yBAAyB,CAAC,KAAK,CAAC,KAAK,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;YACzE,MAAM,KAAK,GAAG,YAAY,CAAC,KAAK,EAAE,GAAG,CAAC,CAAA;YACtC,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAA;YAChC,MAAM,EAAE,KAAK,EAAE,GAAG,EAAE,CAAA;QACtB,CAAC;QAAC,MAAM,CAAC;YACP,4CAA4C;YAC5C,gDAAgD;QAClD,CAAC;IACH,CAAC;AACH,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@cedarjs/structure",
|
|
3
|
-
"version": "7.0.0-canary.
|
|
3
|
+
"version": "7.0.0-canary.3177",
|
|
4
4
|
"description": "noun: the arrangement of and relations between the parts or elements of something complex",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -54,7 +54,7 @@
|
|
|
54
54
|
"test:watch": "vitest watch"
|
|
55
55
|
},
|
|
56
56
|
"dependencies": {
|
|
57
|
-
"@cedarjs/project-config": "7.0.0-canary.
|
|
57
|
+
"@cedarjs/project-config": "7.0.0-canary.3177",
|
|
58
58
|
"@prisma/internals": "7.10.0",
|
|
59
59
|
"@types/line-column": "1.0.2",
|
|
60
60
|
"camelcase": "6.3.0",
|