@cedarjs/structure 2.2.0 → 2.2.1-next.21
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/hosts.d.ts.map +1 -1
- package/dist/hosts.js +5 -6
- package/dist/interactive_cli/dry_run.d.ts.map +1 -1
- package/dist/interactive_cli/dry_run.js +9 -6
- package/dist/model/RWEnvHelper.js +7 -7
- package/dist/model/util/process_env.d.ts.map +1 -1
- package/dist/model/util/process_env.js +4 -4
- package/dist/x/path.js +2 -2
- package/dist/x/prisma.d.ts.map +1 -1
- package/dist/x/prisma.js +3 -3
- package/package.json +3 -5
package/dist/hosts.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hosts.d.ts","sourceRoot":"","sources":["../src/hosts.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"hosts.d.ts","sourceRoot":"","sources":["../src/hosts.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,yBAAyB,CAAA;AAKpD;;;;GAIG;AACH,MAAM,WAAW,IAAI;IACnB,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAA;IACjC,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAA;IAClC,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,CAAA;IACnC,QAAQ,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,EAAE,CAAA;IACnC,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAA;IACnD,KAAK,EAAE,KAAK,CAAA;CACb;AAED,qBAAa,WAAY,YAAW,IAAI;IACtC,UAAU,CAAC,IAAI,EAAE,MAAM;IAGvB,YAAY,CAAC,IAAI,EAAE,MAAM;IAGzB,WAAW,CAAC,IAAI,EAAE,MAAM;IAGxB,QAAQ,CAAC,OAAO,EAAE,MAAM;IAIxB,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM;IAG5C,IACI,KAAK,UAER;CACF"}
|
package/dist/hosts.js
CHANGED
|
@@ -2,7 +2,6 @@
|
|
|
2
2
|
|
|
3
3
|
var _Object$defineProperty = require("@babel/runtime-corejs3/core-js/object/define-property");
|
|
4
4
|
var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequireDefault").default;
|
|
5
|
-
var _interopRequireWildcard = require("@babel/runtime-corejs3/helpers/interopRequireWildcard").default;
|
|
6
5
|
_Object$defineProperty(exports, "__esModule", {
|
|
7
6
|
value: true
|
|
8
7
|
});
|
|
@@ -10,8 +9,8 @@ exports.DefaultHost = void 0;
|
|
|
10
9
|
var _replaceAll = _interopRequireDefault(require("@babel/runtime-corejs3/core-js/instance/replace-all"));
|
|
11
10
|
var _getOwnPropertyDescriptor = _interopRequireDefault(require("@babel/runtime-corejs3/core-js/object/get-own-property-descriptor"));
|
|
12
11
|
var _applyDecoratedDescriptor2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/applyDecoratedDescriptor"));
|
|
12
|
+
var _nodeFs = _interopRequireDefault(require("node:fs"));
|
|
13
13
|
var _fastGlob = _interopRequireDefault(require("fast-glob"));
|
|
14
|
-
var fs = _interopRequireWildcard(require("fs-extra"));
|
|
15
14
|
var _projectConfig = require("@cedarjs/project-config");
|
|
16
15
|
var _decorators = require("./x/decorators");
|
|
17
16
|
var _dec, _class;
|
|
@@ -22,22 +21,22 @@ var _dec, _class;
|
|
|
22
21
|
*/
|
|
23
22
|
let DefaultHost = exports.DefaultHost = (_dec = (0, _decorators.lazy)(), _class = class DefaultHost {
|
|
24
23
|
existsSync(path) {
|
|
25
|
-
return
|
|
24
|
+
return _nodeFs.default.existsSync(path);
|
|
26
25
|
}
|
|
27
26
|
readFileSync(path) {
|
|
28
|
-
return
|
|
27
|
+
return _nodeFs.default.readFileSync(path, {
|
|
29
28
|
encoding: 'utf8'
|
|
30
29
|
}).toString();
|
|
31
30
|
}
|
|
32
31
|
readdirSync(path) {
|
|
33
|
-
return
|
|
32
|
+
return _nodeFs.default.readdirSync(path);
|
|
34
33
|
}
|
|
35
34
|
globSync(pattern) {
|
|
36
35
|
// globSync only works with / as the path separator, even on Windows
|
|
37
36
|
return _fastGlob.default.sync((0, _replaceAll.default)(pattern).call(pattern, '\\', '/'));
|
|
38
37
|
}
|
|
39
38
|
writeFileSync(path, contents) {
|
|
40
|
-
return
|
|
39
|
+
return _nodeFs.default.writeFileSync(path, contents);
|
|
41
40
|
}
|
|
42
41
|
get paths() {
|
|
43
42
|
return (0, _projectConfig.getPaths)();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dry_run.d.ts","sourceRoot":"","sources":["../../src/interactive_cli/dry_run.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAA;AAElE,MAAM,MAAM,OAAO,GAAG;IAAE,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAAA;CAAE,CAAA;AAE3D,UAAU,IAAI;IACZ;;OAEG;IACH,GAAG,EAAE,MAAM,CAAA;IACX;;OAEG;IACH,GAAG,EAAE,oBAAoB,CAAA;IACzB;;OAEG;IACH,aAAa,CAAC,EAAE,OAAO,CAAA;IACvB;;OAEG;IACH,MAAM,CAAC,EAAE,MAAM,CAAA;CAChB;AAED,wBAAsB,mBAAmB,CACvC,IAAI,EAAE,IAAI,GACT,OAAO,CAAC;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,OAAO,CAAA;CAAE,CAAC,
|
|
1
|
+
{"version":3,"file":"dry_run.d.ts","sourceRoot":"","sources":["../../src/interactive_cli/dry_run.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAA;AAElE,MAAM,MAAM,OAAO,GAAG;IAAE,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAAA;CAAE,CAAA;AAE3D,UAAU,IAAI;IACZ;;OAEG;IACH,GAAG,EAAE,MAAM,CAAA;IACX;;OAEG;IACH,GAAG,EAAE,oBAAoB,CAAA;IACzB;;OAEG;IACH,aAAa,CAAC,EAAE,OAAO,CAAA;IACvB;;OAEG;IACH,MAAM,CAAC,EAAE,MAAM,CAAA;CAChB;AAED,wBAAsB,mBAAmB,CACvC,IAAI,EAAE,IAAI,GACT,OAAO,CAAC;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,OAAO,CAAA;CAAE,CAAC,CAgC7C"}
|
|
@@ -8,8 +8,8 @@ _Object$defineProperty(exports, "__esModule", {
|
|
|
8
8
|
exports.redwood_gen_dry_run = redwood_gen_dry_run;
|
|
9
9
|
var _stringify = _interopRequireDefault(require("@babel/runtime-corejs3/core-js/json/stringify"));
|
|
10
10
|
require("core-js/modules/esnext.json.parse.js");
|
|
11
|
-
var
|
|
12
|
-
var
|
|
11
|
+
var _nodeFs = _interopRequireDefault(require("node:fs"));
|
|
12
|
+
var _nodePath = _interopRequireDefault(require("node:path"));
|
|
13
13
|
var _proxyquire = _interopRequireDefault(require("proxyquire"));
|
|
14
14
|
var _child_process = require("../x/child_process");
|
|
15
15
|
async function redwood_gen_dry_run(opts) {
|
|
@@ -24,8 +24,8 @@ async function redwood_gen_dry_run(opts) {
|
|
|
24
24
|
}
|
|
25
25
|
// eslint-disable-next-line
|
|
26
26
|
const x = [_proxyquire.default].length; // we need to make sure this module is required. it will be used in a script we will generate dynamically
|
|
27
|
-
const tempDir = tmpdir ??
|
|
28
|
-
const jsfile =
|
|
27
|
+
const tempDir = tmpdir ?? _nodePath.default.join(cwd, '.tmp');
|
|
28
|
+
const jsfile = _nodePath.default.join(tempDir, 'rwcli.js');
|
|
29
29
|
const requireStatement = 'proxyquire';
|
|
30
30
|
// if (extensionPath) {
|
|
31
31
|
// requireStatement = relative(
|
|
@@ -33,7 +33,10 @@ async function redwood_gen_dry_run(opts) {
|
|
|
33
33
|
// extensionPath + "/node_modules/proxyquire"
|
|
34
34
|
// );
|
|
35
35
|
// }
|
|
36
|
-
|
|
36
|
+
_nodeFs.default.mkdirSync(tempDir, {
|
|
37
|
+
recursive: true
|
|
38
|
+
});
|
|
39
|
+
_nodeFs.default.writeFileSync(jsfile, buildJS(fileOverrides, requireStatement));
|
|
37
40
|
const cmdargs = 'node ' + jsfile + ' ' + cmd.processed;
|
|
38
41
|
const [cmd2, ...args] = cmdargs.split(' ');
|
|
39
42
|
// TODO: use execa?
|
|
@@ -57,7 +60,7 @@ const separator = '---------===----===--------';
|
|
|
57
60
|
function buildJS(fileOverrides = {}, proxyquireRequireStatement = 'proxyquire') {
|
|
58
61
|
let js = `
|
|
59
62
|
const proxyquire = require("proxyquire")
|
|
60
|
-
const fs = require('fs')
|
|
63
|
+
const fs = require('node:fs')
|
|
61
64
|
const path = require('path')
|
|
62
65
|
const files = {}
|
|
63
66
|
const fileOverrides = { FILE: "OVERRIDES" }
|
|
@@ -15,9 +15,9 @@ var _from = _interopRequireDefault(require("@babel/runtime-corejs3/core-js/array
|
|
|
15
15
|
var _getOwnPropertyDescriptor = _interopRequireDefault(require("@babel/runtime-corejs3/core-js/object/get-own-property-descriptor"));
|
|
16
16
|
var _findIndex = _interopRequireDefault(require("@babel/runtime-corejs3/core-js/instance/find-index"));
|
|
17
17
|
var _applyDecoratedDescriptor2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/applyDecoratedDescriptor"));
|
|
18
|
-
var
|
|
18
|
+
var _nodeFs = _interopRequireDefault(require("node:fs"));
|
|
19
|
+
var _nodePath = require("node:path");
|
|
19
20
|
var dotenv = _interopRequireWildcard(require("dotenv-defaults"));
|
|
20
|
-
var _fsExtra = require("fs-extra");
|
|
21
21
|
var _lodash = require("lodash");
|
|
22
22
|
var _vscodeLanguageserver = require("vscode-languageserver");
|
|
23
23
|
var _projectConfig = require("@cedarjs/project-config");
|
|
@@ -88,11 +88,11 @@ let RWEnvHelper = exports.RWEnvHelper = (_dec = (0, _decorators.lazy)(), _dec2 =
|
|
|
88
88
|
});
|
|
89
89
|
}
|
|
90
90
|
_dotenv(f) {
|
|
91
|
-
const file = (0,
|
|
92
|
-
if (!
|
|
91
|
+
const file = (0, _nodePath.join)(this.parent.projectRoot, f);
|
|
92
|
+
if (!_nodeFs.default.existsSync(file)) {
|
|
93
93
|
return undefined;
|
|
94
94
|
}
|
|
95
|
-
return dotenv.parse(
|
|
95
|
+
return dotenv.parse(_nodeFs.default.readFileSync(file, 'utf-8'));
|
|
96
96
|
}
|
|
97
97
|
get env_available_to_api() {
|
|
98
98
|
// in the API side, all variables are visible
|
|
@@ -183,8 +183,8 @@ let ProcessDotEnvExpression = (_dec8 = (0, _decorators.lazy)(), _dec9 = (0, _dec
|
|
|
183
183
|
if (!x) {
|
|
184
184
|
return undefined;
|
|
185
185
|
}
|
|
186
|
-
const file = (0,
|
|
187
|
-
const content =
|
|
186
|
+
const file = (0, _nodePath.join)(this.parent.parent.projectRoot, x);
|
|
187
|
+
const content = _nodeFs.default.readFileSync(file).toString();
|
|
188
188
|
const lines = content.split('\n');
|
|
189
189
|
const index = (0, _findIndex.default)(lines).call(lines, l => (0, _startsWith.default)(l).call(l, this.key + '='));
|
|
190
190
|
return {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"process_env.d.ts","sourceRoot":"","sources":["../../../src/model/util/process_env.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,GAAG,MAAM,UAAU,CAAA;AAK/B,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,MAAM;;;;;;
|
|
1
|
+
{"version":3,"file":"process_env.d.ts","sourceRoot":"","sources":["../../../src/model/util/process_env.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,GAAG,MAAM,UAAU,CAAA;AAK/B,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,MAAM;;;;;;KAU9C;AAED,wBAAgB,sBAAsB,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM;;;;;;KASpE;AAED,wBAAgB,uBAAuB,CAAC,EAAE,EAAE,GAAG,CAAC,UAAU;;;;;;KAwBzD"}
|
|
@@ -12,9 +12,9 @@ exports.process_env_findInFile2 = process_env_findInFile2;
|
|
|
12
12
|
var _replaceAll = _interopRequireDefault(require("@babel/runtime-corejs3/core-js/instance/replace-all"));
|
|
13
13
|
var _includes = _interopRequireDefault(require("@babel/runtime-corejs3/core-js/instance/includes"));
|
|
14
14
|
var _filter = _interopRequireDefault(require("@babel/runtime-corejs3/core-js/instance/filter"));
|
|
15
|
-
var
|
|
15
|
+
var _nodeFs = _interopRequireDefault(require("node:fs"));
|
|
16
|
+
var _path = _interopRequireDefault(require("path"));
|
|
16
17
|
var _fastGlob = _interopRequireDefault(require("fast-glob"));
|
|
17
|
-
var _fsExtra = require("fs-extra");
|
|
18
18
|
var tsm = _interopRequireWildcard(require("ts-morph"));
|
|
19
19
|
var _Array = require("../../x/Array");
|
|
20
20
|
var _tsMorph2 = require("../../x/ts-morph");
|
|
@@ -22,9 +22,9 @@ function process_env_findAll(dir) {
|
|
|
22
22
|
return (0, _Array.iter)(function* () {
|
|
23
23
|
var _context;
|
|
24
24
|
// globSync only works with / as the path separator, even on Windows
|
|
25
|
-
const globPath = (0, _replaceAll.default)(_context =
|
|
25
|
+
const globPath = (0, _replaceAll.default)(_context = _path.default.join(dir, 'src/**/*.{js,ts,jsx,tsx}')).call(_context, '\\', '/');
|
|
26
26
|
for (const file of _fastGlob.default.sync(globPath)) {
|
|
27
|
-
yield* process_env_findInFile(file,
|
|
27
|
+
yield* process_env_findInFile(file, _nodeFs.default.readFileSync(file).toString());
|
|
28
28
|
}
|
|
29
29
|
});
|
|
30
30
|
}
|
package/dist/x/path.js
CHANGED
|
@@ -12,7 +12,7 @@ exports.isCellFileName = isCellFileName;
|
|
|
12
12
|
exports.isLayoutFileName = isLayoutFileName;
|
|
13
13
|
var _endsWith = _interopRequireDefault(require("@babel/runtime-corejs3/core-js/instance/ends-with"));
|
|
14
14
|
require("core-js/modules/es.array.push.js");
|
|
15
|
-
var
|
|
15
|
+
var _nodeFs = require("node:fs");
|
|
16
16
|
var _path = require("path");
|
|
17
17
|
function directoryNameResolver(dirName) {
|
|
18
18
|
dirName = (0, _path.normalize)(dirName);
|
|
@@ -23,7 +23,7 @@ function directoryNameResolver(dirName) {
|
|
|
23
23
|
const pathNoExt = parts.join(_path.sep);
|
|
24
24
|
for (const ext of extensions) {
|
|
25
25
|
const path = pathNoExt + ext;
|
|
26
|
-
if ((0,
|
|
26
|
+
if ((0, _nodeFs.existsSync)(path)) {
|
|
27
27
|
return path;
|
|
28
28
|
}
|
|
29
29
|
}
|
package/dist/x/prisma.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prisma.d.ts","sourceRoot":"","sources":["../../src/x/prisma.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"prisma.d.ts","sourceRoot":"","sources":["../../src/x/prisma.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAA;AACrD,OAAO,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAA;AAK7C;;;GAGG;AACH,wBAAiB,gCAAgC,CAC/C,oBAAoB,EAAE,MAAM;;;iCAa7B;AAED;;;GAGG;AACH,wBAAiB,0BAA0B,CAAC,GAAG,EAAE,MAAM;;;kBActD"}
|
package/dist/x/prisma.js
CHANGED
|
@@ -9,7 +9,7 @@ exports.prisma_parseEnvExpressions = prisma_parseEnvExpressions;
|
|
|
9
9
|
exports.prisma_parseEnvExpressionsInFile = prisma_parseEnvExpressionsInFile;
|
|
10
10
|
require("core-js/modules/esnext.json.parse.js");
|
|
11
11
|
var _matchAll = _interopRequireDefault(require("@babel/runtime-corejs3/core-js/instance/match-all"));
|
|
12
|
-
var
|
|
12
|
+
var _nodeFs = require("node:fs");
|
|
13
13
|
var _vscodeLanguageserver = require("vscode-languageserver");
|
|
14
14
|
var _URL = require("./URL");
|
|
15
15
|
var _vscodeLanguageserverTypes = require("./vscode-languageserver-types");
|
|
@@ -20,10 +20,10 @@ var _vscodeLanguageserverTypes = require("./vscode-languageserver-types");
|
|
|
20
20
|
function* prisma_parseEnvExpressionsInFile(prismaSchemaFilePath) {
|
|
21
21
|
const uri = (0, _URL.URL_file)(prismaSchemaFilePath);
|
|
22
22
|
const file = (0, _URL.URL_toFile)(uri); // convert back and forth in case someone passed a uri
|
|
23
|
-
if (!(0,
|
|
23
|
+
if (!(0, _nodeFs.existsSync)(file)) {
|
|
24
24
|
return [];
|
|
25
25
|
} // fail silently
|
|
26
|
-
const src = (0,
|
|
26
|
+
const src = (0, _nodeFs.readFileSync)(file).toString();
|
|
27
27
|
const exprs = prisma_parseEnvExpressions(src);
|
|
28
28
|
for (const {
|
|
29
29
|
range,
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@cedarjs/structure",
|
|
3
|
-
"version": "2.2.
|
|
3
|
+
"version": "2.2.1-next.21+014660ad1",
|
|
4
4
|
"description": "noun: the arrangement of and relations between the parts or elements of something complex",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -26,7 +26,7 @@
|
|
|
26
26
|
},
|
|
27
27
|
"dependencies": {
|
|
28
28
|
"@babel/runtime-corejs3": "7.28.4",
|
|
29
|
-
"@cedarjs/project-config": "2.2.
|
|
29
|
+
"@cedarjs/project-config": "2.2.1-next.21+014660ad1",
|
|
30
30
|
"@prisma/internals": "6.19.1",
|
|
31
31
|
"@types/line-column": "1.0.2",
|
|
32
32
|
"camelcase": "6.3.0",
|
|
@@ -35,7 +35,6 @@
|
|
|
35
35
|
"dotenv-defaults": "5.0.2",
|
|
36
36
|
"enquirer": "2.4.1",
|
|
37
37
|
"fast-glob": "3.3.3",
|
|
38
|
-
"fs-extra": "11.3.3",
|
|
39
38
|
"graphql": "16.12.0",
|
|
40
39
|
"lazy-get-decorator": "2.2.1",
|
|
41
40
|
"line-column": "1.0.2",
|
|
@@ -53,7 +52,6 @@
|
|
|
53
52
|
"devDependencies": {
|
|
54
53
|
"@babel/cli": "7.28.3",
|
|
55
54
|
"@babel/core": "^7.26.10",
|
|
56
|
-
"@types/fs-extra": "11.0.4",
|
|
57
55
|
"@types/lodash": "4.17.21",
|
|
58
56
|
"@types/node": "24.10.4",
|
|
59
57
|
"@types/vscode": "1.107.0",
|
|
@@ -63,5 +61,5 @@
|
|
|
63
61
|
"publishConfig": {
|
|
64
62
|
"access": "public"
|
|
65
63
|
},
|
|
66
|
-
"gitHead": "
|
|
64
|
+
"gitHead": "014660ad1d93c58cd848e67a370bf4856cd64a11"
|
|
67
65
|
}
|