@cedarjs/structure 1.1.1-next.21 → 1.1.1-rc.3

package/dist/model/RWEnvHelper.d.ts

@@ -37,8 +37,8 @@ export declare class RWEnvHelper extends BaseNode {
     private _dotenv;
     get env_available_to_api(): EnvVarMap;
     get env_available_to_web(): EnvVarMap;
-    children(): Promise<ProcessDotEnvExpression[]>;
-    process_env_expressions(): Promise<ProcessDotEnvExpression[]>;
+    children(): ProcessDotEnvExpression[];
+    get process_env_expressions(): ProcessDotEnvExpression[];
 }
 /**
  * An occurrence of process.env somewhere in the codebase

package/dist/model/RWEnvHelper.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"RWEnvHelper.d.ts","sourceRoot":"","sources":["../../src/model/RWEnvHelper.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,KAAK,GAAG,MAAM,UAAU,CAAA;AACpC,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAA;AAKrD,OAAO,KAAK,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAA;AACtE,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAA;AAKjC,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,kCAAkC,CAAA;AAO1E,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AAG5C,KAAK,SAAS,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;AAEvC,qBAAa,WAAY,SAAQ,QAAQ;IACpB,MAAM,EAAE,SAAS;gBAAjB,MAAM,EAAE,SAAS;IAIpC,IAAY,EAAE,WAGb;IAED,mBAAmB;IAMnB;;;;OAIG;IACH,IAAY,GAAG,IAAI,SAAS,GAAG,SAAS,CAEvC;IAED;;;OAGG;IACH,IAAY,YAAY,IAAI,SAAS,GAAG,SAAS,CAEhD;IAED,IAAY,cAAc,mDAEzB;IAED;;;OAGG;IACH,IAAY,kBAAkB,IAAI,SAAS,CAE1C;IAED;;;;;OAKG;IACH,OAAO,CAAC,2BAA2B;IAOnC,OAAO,CAAC,OAAO;IAQf,IAAY,oBAAoB,cAM/B;IAED,IAAY,oBAAoB,cAI/B;IAEK,QAAQ;IAIR,uBAAuB;CAe9B;AAED;;GAEG;AACH,cAAM,uBAAwB,SAAQ,QAAQ;IAEnC,MAAM,EAAE,WAAW;IACnB,IAAI,EAAE,KAAK,GAAG,KAAK,GAAG,QAAQ;IAC9B,GAAG,EAAE,MAAM;IACX,IAAI,EAAE,GAAG,CAAC,IAAI,GAAG,QAAQ;gBAHzB,MAAM,EAAE,WAAW,EACnB,IAAI,EAAE,KAAK,GAAG,KAAK,GAAG,QAAQ,EAC9B,GAAG,EAAE,MAAM,EACX,IAAI,EAAE,GAAG,CAAC,IAAI,GAAG,QAAQ;IAKlC,mBAAmB,CAAC,GAAG,EAAE,MAAM;IAO/B,IAAY,EAAE,WAIb;IAED,IAAY,IAAI,kBAEf;IAED,IAAY,QAAQ,aAEnB;IAEA,OAAO;IAQP,WAAW;IAQZ,IAAY,8BAA8B,yCAYzC;IAED,IAAY,yBAAyB,IAAI,QAAQ,GAAG,SAAS,CAa5D;IAED,IAAY,kBAAkB,WAM7B;IAED,OAAO,CAAE,MAAM;CA+FhB"}
+{"version":3,"file":"RWEnvHelper.d.ts","sourceRoot":"","sources":["../../src/model/RWEnvHelper.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,KAAK,GAAG,MAAM,UAAU,CAAA;AACpC,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAA;AAGrD,OAAO,KAAK,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAA;AACtE,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAA;AAKjC,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,kCAAkC,CAAA;AAO1E,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AAG5C,KAAK,SAAS,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;AAEvC,qBAAa,WAAY,SAAQ,QAAQ;IACpB,MAAM,EAAE,SAAS;gBAAjB,MAAM,EAAE,SAAS;IAIpC,IAAY,EAAE,WAGb;IAED,mBAAmB;IAMnB;;;;OAIG;IACH,IAAY,GAAG,IAAI,SAAS,GAAG,SAAS,CAEvC;IAED;;;OAGG;IACH,IAAY,YAAY,IAAI,SAAS,GAAG,SAAS,CAEhD;IAED,IAAY,cAAc,mDAEzB;IAED;;;OAGG;IACH,IAAY,kBAAkB,IAAI,SAAS,CAE1C;IAED;;;;;OAKG;IACH,OAAO,CAAC,2BAA2B;IAOnC,OAAO,CAAC,OAAO;IAQf,IAAY,oBAAoB,cAM/B;IAED,IAAY,oBAAoB,cAI/B;IAED,QAAQ;IAIR,IAAY,uBAAuB,8BAgBlC;CACF;AAED;;GAEG;AACH,cAAM,uBAAwB,SAAQ,QAAQ;IAEnC,MAAM,EAAE,WAAW;IACnB,IAAI,EAAE,KAAK,GAAG,KAAK,GAAG,QAAQ;IAC9B,GAAG,EAAE,MAAM;IACX,IAAI,EAAE,GAAG,CAAC,IAAI,GAAG,QAAQ;gBAHzB,MAAM,EAAE,WAAW,EACnB,IAAI,EAAE,KAAK,GAAG,KAAK,GAAG,QAAQ,EAC9B,GAAG,EAAE,MAAM,EACX,IAAI,EAAE,GAAG,CAAC,IAAI,GAAG,QAAQ;IAKlC,mBAAmB,CAAC,GAAG,EAAE,MAAM;IAO/B,IAAY,EAAE,WAIb;IAED,IAAY,IAAI,kBAEf;IAED,IAAY,QAAQ,aAEnB;IAEA,OAAO;IAQP,WAAW;IAQZ,IAAY,8BAA8B,yCAYzC;IAED,IAAY,yBAAyB,IAAI,QAAQ,GAAG,SAAS,CAa5D;IAED,IAAY,kBAAkB,WAM7B;IAED,OAAO,CAAE,MAAM;CA+FhB"}

package/dist/model/RWEnvHelper.js

@@ -20,7 +20,6 @@ var dotenv = _interopRequireWildcard(require("dotenv-defaults"));
 var _fsExtra = require("fs-extra");
 var _lodash = require("lodash");
 var _vscodeLanguageserver = require("vscode-languageserver");
-var _projectConfig = require("@cedarjs/project-config");
 var _ide = require("../ide");
 var _decorators = require("../x/decorators");
 var _prisma = require("../x/prisma");
@@ -28,8 +27,8 @@ var _URL = require("../x/URL");
 var _vscode = require("../x/vscode");
 var _vscodeLanguageserverTypes = require("../x/vscode-languageserver-types");
 var _process_env = require("./util/process_env");
-var _dec, _dec2, _dec3, _dec4, _dec5, _dec6, _dec7, _class, _dec8, _dec9, _dec0, _dec1, _dec10, _dec11, _class2;
-let RWEnvHelper = exports.RWEnvHelper = (_dec = (0, _decorators.lazy)(), _dec2 = (0, _decorators.lazy)(), _dec3 = (0, _decorators.lazy)(), _dec4 = (0, _decorators.lazy)(), _dec5 = (0, _decorators.lazy)(), _dec6 = (0, _decorators.lazy)(), _dec7 = (0, _decorators.lazy)(), _class = class RWEnvHelper extends _ide.BaseNode {
+var _dec, _dec2, _dec3, _dec4, _dec5, _dec6, _dec7, _dec8, _class, _dec9, _dec0, _dec1, _dec10, _dec11, _dec12, _class2;
+let RWEnvHelper = exports.RWEnvHelper = (_dec = (0, _decorators.lazy)(), _dec2 = (0, _decorators.lazy)(), _dec3 = (0, _decorators.lazy)(), _dec4 = (0, _decorators.lazy)(), _dec5 = (0, _decorators.lazy)(), _dec6 = (0, _decorators.lazy)(), _dec7 = (0, _decorators.lazy)(), _dec8 = (0, _decorators.lazy)(), _class = class RWEnvHelper extends _ide.BaseNode {
   constructor(parent) {
     super();
     this.parent = parent;
@@ -104,26 +103,26 @@ let RWEnvHelper = exports.RWEnvHelper = (_dec = (0, _decorators.lazy)(), _dec2 =
   get env_available_to_web() {
     return this.env_default_merged_filtered(this.parent.redwoodTOML.web_includeEnvironmentVariables ?? []);
   }
-  async children() {
-    return [...(await this.process_env_expressions())];
+  children() {
+    return [...this.process_env_expressions];
   }
-  async process_env_expressions() {
+  get process_env_expressions() {
     var _context3, _context4;
+    // TODO: make this async (this is globbing around quite a bit)
     const {
       pathHelper
     } = this.parent;
     const api = (0, _map.default)(_context3 = (0, _process_env.process_env_findAll)(pathHelper.api.base)).call(_context3, x => new ProcessDotEnvExpression(this, 'api', x.key, x.node));
     const web = (0, _map.default)(_context4 = (0, _process_env.process_env_findAll)(pathHelper.web.base)).call(_context4, x => new ProcessDotEnvExpression(this, 'web', x.key, x.node));
-    const schemaPath = await (0, _projectConfig.getSchemaPath)(pathHelper.api.prismaConfig);
-    const prisma = (0, _from.default)((0, _prisma.prisma_parseEnvExpressionsInFile)(schemaPath));
+    const prisma = (0, _from.default)((0, _prisma.prisma_parseEnvExpressionsInFile)(pathHelper.api.dbSchema));
     const pp = (0, _map.default)(prisma).call(prisma, x => new ProcessDotEnvExpression(this, 'prisma', x.key, x.location));
     return [...api, ...web, ...pp];
   }
-}, (0, _applyDecoratedDescriptor2.default)(_class.prototype, "id", [_dec], (0, _getOwnPropertyDescriptor.default)(_class.prototype, "id"), _class.prototype), (0, _applyDecoratedDescriptor2.default)(_class.prototype, "env", [_dec2], (0, _getOwnPropertyDescriptor.default)(_class.prototype, "env"), _class.prototype), (0, _applyDecoratedDescriptor2.default)(_class.prototype, "env_defaults", [_dec3], (0, _getOwnPropertyDescriptor.default)(_class.prototype, "env_defaults"), _class.prototype), (0, _applyDecoratedDescriptor2.default)(_class.prototype, "api_prisma_env", [_dec4], (0, _getOwnPropertyDescriptor.default)(_class.prototype, "api_prisma_env"), _class.prototype), (0, _applyDecoratedDescriptor2.default)(_class.prototype, "env_default_merged", [_dec5], (0, _getOwnPropertyDescriptor.default)(_class.prototype, "env_default_merged"), _class.prototype), (0, _applyDecoratedDescriptor2.default)(_class.prototype, "env_available_to_api", [_dec6], (0, _getOwnPropertyDescriptor.default)(_class.prototype, "env_available_to_api"), _class.prototype), (0, _applyDecoratedDescriptor2.default)(_class.prototype, "env_available_to_web", [_dec7], (0, _getOwnPropertyDescriptor.default)(_class.prototype, "env_available_to_web"), _class.prototype), _class);
+}, (0, _applyDecoratedDescriptor2.default)(_class.prototype, "id", [_dec], (0, _getOwnPropertyDescriptor.default)(_class.prototype, "id"), _class.prototype), (0, _applyDecoratedDescriptor2.default)(_class.prototype, "env", [_dec2], (0, _getOwnPropertyDescriptor.default)(_class.prototype, "env"), _class.prototype), (0, _applyDecoratedDescriptor2.default)(_class.prototype, "env_defaults", [_dec3], (0, _getOwnPropertyDescriptor.default)(_class.prototype, "env_defaults"), _class.prototype), (0, _applyDecoratedDescriptor2.default)(_class.prototype, "api_prisma_env", [_dec4], (0, _getOwnPropertyDescriptor.default)(_class.prototype, "api_prisma_env"), _class.prototype), (0, _applyDecoratedDescriptor2.default)(_class.prototype, "env_default_merged", [_dec5], (0, _getOwnPropertyDescriptor.default)(_class.prototype, "env_default_merged"), _class.prototype), (0, _applyDecoratedDescriptor2.default)(_class.prototype, "env_available_to_api", [_dec6], (0, _getOwnPropertyDescriptor.default)(_class.prototype, "env_available_to_api"), _class.prototype), (0, _applyDecoratedDescriptor2.default)(_class.prototype, "env_available_to_web", [_dec7], (0, _getOwnPropertyDescriptor.default)(_class.prototype, "env_available_to_web"), _class.prototype), (0, _applyDecoratedDescriptor2.default)(_class.prototype, "process_env_expressions", [_dec8], (0, _getOwnPropertyDescriptor.default)(_class.prototype, "process_env_expressions"), _class.prototype), _class);
 /**
  * An occurrence of process.env somewhere in the codebase
  */
-let ProcessDotEnvExpression = (_dec8 = (0, _decorators.lazy)(), _dec9 = (0, _decorators.lazy)(), _dec0 = (0, _decorators.lazy)(), _dec1 = (0, _decorators.lazy)(), _dec10 = (0, _decorators.lazy)(), _dec11 = (0, _decorators.lazy)(), _class2 = class ProcessDotEnvExpression extends _ide.BaseNode {
+let ProcessDotEnvExpression = (_dec9 = (0, _decorators.lazy)(), _dec0 = (0, _decorators.lazy)(), _dec1 = (0, _decorators.lazy)(), _dec10 = (0, _decorators.lazy)(), _dec11 = (0, _decorators.lazy)(), _dec12 = (0, _decorators.lazy)(), _class2 = class ProcessDotEnvExpression extends _ide.BaseNode {
   constructor(parent, kind, key, node) {
     super();
     this.parent = parent;
@@ -293,4 +292,4 @@ ${snippet}
       }
     }
   }
-}, (0, _applyDecoratedDescriptor2.default)(_class2.prototype, "id", [_dec8], (0, _getOwnPropertyDescriptor.default)(_class2.prototype, "id"), _class2.prototype), (0, _applyDecoratedDescriptor2.default)(_class2.prototype, "side", [_dec9], (0, _getOwnPropertyDescriptor.default)(_class2.prototype, "side"), _class2.prototype), (0, _applyDecoratedDescriptor2.default)(_class2.prototype, "location", [_dec0], (0, _getOwnPropertyDescriptor.default)(_class2.prototype, "location"), _class2.prototype), (0, _applyDecoratedDescriptor2.default)(_class2.prototype, "value_definition_file_basename", [_dec1], (0, _getOwnPropertyDescriptor.default)(_class2.prototype, "value_definition_file_basename"), _class2.prototype), (0, _applyDecoratedDescriptor2.default)(_class2.prototype, "value_definition_location", [_dec10], (0, _getOwnPropertyDescriptor.default)(_class2.prototype, "value_definition_location"), _class2.prototype), (0, _applyDecoratedDescriptor2.default)(_class2.prototype, "value_as_available", [_dec11], (0, _getOwnPropertyDescriptor.default)(_class2.prototype, "value_as_available"), _class2.prototype), _class2);
+}, (0, _applyDecoratedDescriptor2.default)(_class2.prototype, "id", [_dec9], (0, _getOwnPropertyDescriptor.default)(_class2.prototype, "id"), _class2.prototype), (0, _applyDecoratedDescriptor2.default)(_class2.prototype, "side", [_dec0], (0, _getOwnPropertyDescriptor.default)(_class2.prototype, "side"), _class2.prototype), (0, _applyDecoratedDescriptor2.default)(_class2.prototype, "location", [_dec1], (0, _getOwnPropertyDescriptor.default)(_class2.prototype, "location"), _class2.prototype), (0, _applyDecoratedDescriptor2.default)(_class2.prototype, "value_definition_file_basename", [_dec10], (0, _getOwnPropertyDescriptor.default)(_class2.prototype, "value_definition_file_basename"), _class2.prototype), (0, _applyDecoratedDescriptor2.default)(_class2.prototype, "value_definition_location", [_dec11], (0, _getOwnPropertyDescriptor.default)(_class2.prototype, "value_definition_location"), _class2.prototype), (0, _applyDecoratedDescriptor2.default)(_class2.prototype, "value_as_available", [_dec12], (0, _getOwnPropertyDescriptor.default)(_class2.prototype, "value_as_available"), _class2.prototype), _class2);

package/dist/model/RWProject.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"RWProject.d.ts","sourceRoot":"","sources":["../../src/model/RWProject.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,0BAA0B,CAAA;AASpD,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,UAAU,CAAA;AACpC,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAA;AASjC,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAA;AACjC,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAA;AAC3C,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAA;AAC3C,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AACzC,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AACrC,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAA;AACjC,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AACrC,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAA;AAC/B,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AACvC,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAA;AAEjC,MAAM,WAAW,gBAAgB;IAC/B,WAAW,EAAE,MAAM,CAAA;IACnB,IAAI,EAAE,IAAI,CAAA;CACX;AAID;;;GAGG;AACH,qBAAa,SAAU,SAAQ,QAAQ;IAClB,IAAI,EAAE,gBAAgB;gBAAtB,IAAI,EAAE,gBAAgB;IAGzC,MAAM,YAAY;IAElB,IAAI,IAAI,SAEP;IAED,IAAI,WAAW,WAEd;IAED,IAAY,EAAE,WAEb;IAED,QAAQ;IAaR;;OAEG;IACH,IAAY,UAAU,4CAErB;IACD;;OAEG;IACH,IAAY,mBAAmB,IAAI,OAAO,CAKzC;IAEa,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC,QAAQ,GAAG,SAAS,CAAC;IAWhD,oBAAoB;IAOlC,IAAY,WAAW,IAAI,MAAM,CAEhC;IACO,OAAO,KAAK,eAAe,GAMlC;IACD,IAAY,KAAK,IAAI,MAAM,EAAE,CAI5B;IACD,IAAY,MAAM,aAEjB;IACD,SAAS,iBAER;IAGD,gBAAgB,CAAC,IAAI,EAAE,MAAM;IAO7B,IAAY,2BAA2B,WAGtC;IAED,IAAY,QAAQ,gBAOnB;IAED,IAAY,IAAI,YAIf;IAED,IAAY,OAAO,IAAI,QAAQ,EAAE,CAOhC;IAED,IAAY,SAAS,IAAI,UAAU,EAAE,CAKpC;IAED,IAAY,UAAU,IAAI,WAAW,EAAE,CAYtC;IAED,IAAY,KAAK,aAEhB;IAGD,IAAY,KAAK,aAEhB;IAED;;;QAGI;IACJ,IAAY,KAAK,IAAI,MAAM,EAAE,CAK5B;IAED,IAAY,SAAS,IAAI,WAAW,CAEnC;CACF"}
+{"version":3,"file":"RWProject.d.ts","sourceRoot":"","sources":["../../src/model/RWProject.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,0BAA0B,CAAA;AAKpD,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,UAAU,CAAA;AACpC,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAA;AASjC,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAA;AACjC,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAA;AAC3C,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAA;AAC3C,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AACzC,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AACrC,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAA;AACjC,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AACrC,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAA;AAC/B,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AACvC,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAA;AAEjC,MAAM,WAAW,gBAAgB;IAC/B,WAAW,EAAE,MAAM,CAAA;IACnB,IAAI,EAAE,IAAI,CAAA;CACX;AAID;;;GAGG;AACH,qBAAa,SAAU,SAAQ,QAAQ;IAClB,IAAI,EAAE,gBAAgB;gBAAtB,IAAI,EAAE,gBAAgB;IAGzC,MAAM,YAAY;IAElB,IAAI,IAAI,SAEP;IAED,IAAI,WAAW,WAEd;IAED,IAAY,EAAE,WAEb;IAED,QAAQ;IAaR;;OAEG;IACH,IAAY,UAAU,4CAErB;IACD;;OAEG;IACH,IAAY,mBAAmB,IAAI,OAAO,CAKzC;IAEa,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC,QAAQ,GAAG,SAAS,CAAC;IAShD,oBAAoB;IAOlC,IAAY,WAAW,IAAI,MAAM,CAEhC;IACO,OAAO,KAAK,eAAe,GAMlC;IACD,IAAY,KAAK,IAAI,MAAM,EAAE,CAI5B;IACD,IAAY,MAAM,aAEjB;IACD,SAAS,iBAER;IAGD,gBAAgB,CAAC,IAAI,EAAE,MAAM;IAO7B,IAAY,2BAA2B,WAGtC;IAED,IAAY,QAAQ,gBAOnB;IAED,IAAY,IAAI,YAIf;IAED,IAAY,OAAO,IAAI,QAAQ,EAAE,CAOhC;IAED,IAAY,SAAS,IAAI,UAAU,EAAE,CAKpC;IAED,IAAY,UAAU,IAAI,WAAW,EAAE,CAYtC;IAED,IAAY,KAAK,aAEhB;IAGD,IAAY,KAAK,aAEhB;IAED;;;QAGI;IACJ,IAAY,KAAK,IAAI,MAAM,EAAE,CAK5B;IAED,IAAY,SAAS,IAAI,WAAW,CAEnC;CACF"}

package/dist/model/RWProject.js

@@ -71,9 +71,7 @@ let RWProject = exports.RWProject = (_dec = (0, _decorators.lazy)(), _dec2 = (0,
   // TODO: do we move this to a separate node? (ex: RWDatabase)
   async prismaDMMF() {
     try {
-      const schemaPath = await (0, _projectConfig.getSchemaPath)(this.pathHelper.api.prismaConfig);
-      const result = await (0, _internals.getSchemaWithPath)(schemaPath);
-      const datamodel = result.schemas;
+      const datamodel = await (0, _internals.getSchema)(this.pathHelper.api.dbSchema);
       // consider case where dmmf doesn't exist (or fails to parse)
       return await (0, _internals.getDMMF)({
         datamodel

package/dist/outline/outline.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"outline.d.ts","sourceRoot":"","sources":["../../src/outline/outline.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,UAAU,CAAA;AAIzC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AAG5C,wBAAgB,UAAU,CAAC,OAAO,EAAE,SAAS,GAAG,SAAS,CA0DxD"}
+{"version":3,"file":"outline.d.ts","sourceRoot":"","sources":["../../src/outline/outline.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,UAAU,CAAA;AAIzC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AAG5C,wBAAgB,UAAU,CAAC,OAAO,EAAE,SAAS,GAAG,SAAS,CA0DxD"}

package/dist/outline/outline.js

@@ -7,18 +7,17 @@ _Object$defineProperty(exports, "__esModule", {
 });
 exports.getOutline = getOutline;
 var _map = _interopRequireDefault(require("@babel/runtime-corejs3/core-js/instance/map"));
-var _projectConfig = require("@cedarjs/project-config");
 var _URL = require("../x/URL");
 var _vscode = require("../x/vscode");
 function getOutline(project) {
   return {
-    children: async () => [_router(project), _pages(project), _components(project), _layouts(project), _cells(project), _services(project), _functions(project), await _schema(project), {
+    children: () => [_router(project), _pages(project), _components(project), _layouts(project), _cells(project), _services(project), _functions(project), _schema(project), {
       label: 'redwood.toml',
       iconPath: 'x-redwood',
       ...resourceUriAndCommandFor((0, _URL.URL_file)(project.pathHelper.base, 'redwood.toml')),
       menu: {
         kind: 'withDoc',
-        doc: (0, _vscode.Command_open)('https://cedarjs.com/docs/app-configuration-redwood-toml')
+        doc: (0, _vscode.Command_open)('https://redwoodjs.com/docs/app-configuration-redwood-toml')
       }
     }, {
       label: 'open graphql playground',
@@ -34,11 +33,11 @@ function getOutline(project) {
       iconPath: 'x-storybook',
       menu: {
         kind: 'withDoc',
-        doc: (0, _vscode.Command_open)('https://cedarjs.com/docs/how-to/mocking-graphql-in-storybook')
+        doc: (0, _vscode.Command_open)('https://redwoodjs.com/how-to/mocking-graph-ql-in-storybook')
       }
     }, _rwcli_command_group({
       cmd: 'generate ...',
-      tooltip: 'start interactive Cedar generator'
+      tooltip: 'start interactive redwood generator'
     }, {
       cmd: 'dev',
       tooltip: 'start development server and open browser'
@@ -60,7 +59,7 @@ function _router(project) {
     menu: {
       kind: 'group',
       add: (0, _vscode.Command_cli)('rw generate page ...'),
-      doc: (0, _vscode.Command_open)('https://cedarjs.com/docs/router')
+      doc: (0, _vscode.Command_open)('https://redwoodjs.com/docs/redwood-router')
     }
   };
 }
@@ -89,7 +88,7 @@ function _pages(project) {
     menu: {
       kind: 'group',
       add: (0, _vscode.Command_cli)('rw generate page ...'),
-      doc: (0, _vscode.Command_open)('https://cedarjs.com/docs/tutorial/chapter1/first-page')
+      doc: (0, _vscode.Command_open)('https://redwoodjs.com/docs/tutorial/chapter1/first-page')
     }
   };
 }
@@ -125,7 +124,7 @@ function _layouts(project) {
     menu: {
       kind: 'group',
       add: (0, _vscode.Command_cli)('rw generate layout ...'),
-      doc: (0, _vscode.Command_open)('https://cedarjs.com/docs/tutorial/chapter1/layouts')
+      doc: (0, _vscode.Command_open)('https://redwoodjs.com/docs/tutorial/chapter1/layouts')
     }
   };
 }
@@ -137,7 +136,7 @@ function _cells(project) {
     menu: {
       kind: 'group',
       add: (0, _vscode.Command_cli)('rw generate cell ...'),
-      doc: (0, _vscode.Command_open)('https://cedarjs.com/docs/tutorial/chapter2/cells')
+      doc: (0, _vscode.Command_open)('https://redwoodjs.com/docs/tutorial/chapter2/cells')
     }
   };
 }
@@ -163,12 +162,11 @@ function _functions(project) {
     menu: {
       kind: 'group',
       add: (0, _vscode.Command_cli)('rw generate function ...'),
-      doc: (0, _vscode.Command_open)('https://cedarjs.com/docs/serverless-functions')
+      doc: (0, _vscode.Command_open)('https://redwoodjs.com/docs/serverless-functions')
     }
   };
 }
-async function _schema(project) {
-  const schemaPath = await (0, _projectConfig.getSchemaPath)(project.pathHelper.api.prismaConfig);
+function _schema(project) {
   return {
     label: 'schema.prisma',
     iconPath: 'x-prisma',
@@ -176,7 +174,7 @@ async function _schema(project) {
       kind: 'withDoc',
       doc: (0, _vscode.Command_open)('https://www.prisma.io/docs/reference/tools-and-interfaces/prisma-schema')
     },
-    ...resourceUriAndCommandFor(schemaPath),
+    ...resourceUriAndCommandFor(project.pathHelper.api.dbSchema),
     async children() {
       var _context3;
       const dmmf = await project.prismaDMMF();
@@ -221,7 +219,7 @@ function _rwcli_command_group(...opts) {
   return {
     label: 'rw cli',
     key: 'rw-cli-commands',
-    tooltip: 'Cedar CLI commands',
+    tooltip: 'Redwood.js CLI commands',
     iconPath: 'terminal',
     children: () => (0, _map.default)(opts).call(opts, _rwcli_command),
     menu: {

package/dist/outline/types.d.ts

@@ -79,8 +79,9 @@ export type OutlineItemJSON = Omit<OutlineItem, 'children'> & {
     children?: OutlineItemJSON[];
 };
 /**
- * this will recursively await all children and return a serializable
- * representation of the complete outline
+ * this will recursively await all children and return a serializable representation
+ * of the complete outline
+ * @param item
  */
 export declare function outlineToJSON(item: OutlineItem): Promise<OutlineItemJSON>;
 export {};

package/dist/outline/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/outline/types.ts"],"names":[],"mappings":"AAAA,oBAAY,IAAI;IACd,OAAO,YAAY;IACnB,IAAI,SAAS;IACb,YAAY,iBAAiB;IAC7B,KAAK,UAAU;IACf,OAAO,YAAY;IACnB,OAAO,YAAY;IACnB,MAAM,WAAW;IACjB,SAAS,cAAc;IACvB,QAAQ,aAAa;IACrB,OAAO,YAAY;IACnB,IAAI,SAAS;IACb,UAAU,eAAe;IACzB,MAAM,WAAW;IACjB,SAAS,cAAc;IACvB,KAAK,UAAU;IACf,KAAK,UAAU;CAChB;AAED,MAAM,WAAW,WAAW;IAC1B;;;OAGG;IACH,KAAK,EAAE,MAAM,CAAA;IACb;;;OAGG;IACH,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ;;OAEG;IACH,WAAW,CAAC,EAAE,MAAM,CAAA;IAEpB,OAAO,CAAC,EAAE,MAAM,CAAA;IAEhB;;;OAGG;IACH,QAAQ,CAAC,IAAI,OAAO,CAAC,WAAW,EAAE,CAAC,CAAA;IAEnC;;;OAGG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAA;IAElB,IAAI,CAAC,EAAE,iBAAiB,CAAA;IACxB;;OAEG;IACH,GAAG,CAAC,EAAE,iBAAiB,CAAA;IACvB,GAAG,CAAC,EAAE,iBAAiB,CAAA;IAEvB,IAAI,CAAC,EAAE,IAAI,CAAA;CACZ;AAED;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,KAAK,iBAAiB,GAAG,MAAM,CAAA;AAE/B,MAAM,MAAM,eAAe,GAAG,IAAI,CAAC,WAAW,EAAE,UAAU,CAAC,GAAG;IAC5D,QAAQ,CAAC,EAAE,eAAe,EAAE,CAAA;CAC7B,CAAA;AAED;;;GAGG;AACH,wBAAsB,aAAa,CACjC,IAAI,EAAE,WAAW,GAChB,OAAO,CAAC,eAAe,CAAC,CAS1B"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/outline/types.ts"],"names":[],"mappings":"AAAA,oBAAY,IAAI;IACd,OAAO,YAAY;IACnB,IAAI,SAAS;IACb,YAAY,iBAAiB;IAC7B,KAAK,UAAU;IACf,OAAO,YAAY;IACnB,OAAO,YAAY;IACnB,MAAM,WAAW;IACjB,SAAS,cAAc;IACvB,QAAQ,aAAa;IACrB,OAAO,YAAY;IACnB,IAAI,SAAS;IACb,UAAU,eAAe;IACzB,MAAM,WAAW;IACjB,SAAS,cAAc;IACvB,KAAK,UAAU;IACf,KAAK,UAAU;CAChB;AAED,MAAM,WAAW,WAAW;IAC1B;;;OAGG;IACH,KAAK,EAAE,MAAM,CAAA;IACb;;;OAGG;IACH,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ;;OAEG;IACH,WAAW,CAAC,EAAE,MAAM,CAAA;IAEpB,OAAO,CAAC,EAAE,MAAM,CAAA;IAEhB;;;OAGG;IACH,QAAQ,CAAC,IAAI,OAAO,CAAC,WAAW,EAAE,CAAC,CAAA;IAEnC;;;OAGG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAA;IAElB,IAAI,CAAC,EAAE,iBAAiB,CAAA;IACxB;;OAEG;IACH,GAAG,CAAC,EAAE,iBAAiB,CAAA;IACvB,GAAG,CAAC,EAAE,iBAAiB,CAAA;IAEvB,IAAI,CAAC,EAAE,IAAI,CAAA;CACZ;AAED;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,KAAK,iBAAiB,GAAG,MAAM,CAAA;AAE/B,MAAM,MAAM,eAAe,GAAG,IAAI,CAAC,WAAW,EAAE,UAAU,CAAC,GAAG;IAC5D,QAAQ,CAAC,EAAE,eAAe,EAAE,CAAA;CAC7B,CAAA;AAED;;;;GAIG;AACH,wBAAsB,aAAa,CACjC,IAAI,EAAE,WAAW,GAChB,OAAO,CAAC,eAAe,CAAC,CAO1B"}

package/dist/outline/types.js

@@ -53,8 +53,9 @@ let Icon = exports.Icon = /*#__PURE__*/function (Icon) {
  *   - see: https://github.com/cedarjs/cedar/tree/main/packages/structure/src/interactive_cli
  */
 /**
- * this will recursively await all children and return a serializable
- * representation of the complete outline
+ * this will recursively await all children and return a serializable representation
+ * of the complete outline
+ * @param item
  */
 async function outlineToJSON(item) {
   if (!item.children) {
@@ -63,10 +64,10 @@ async function outlineToJSON(item) {
       children: undefined
     };
   }
-  const children = item.children ? await item.children() : [];
-  const childrenOutlines = await _promise.default.all((0, _map.default)(children).call(children, outlineToJSON));
+  const cs = item.children ? await item.children() : [];
+  const css = await _promise.default.all((0, _map.default)(cs).call(cs, outlineToJSON));
   return {
     ...item,
-    children: childrenOutlines
+    children: css
   };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/structure",
-  "version": "1.1.1-next.21+77cfbaa90",
+  "version": "1.1.1-rc.3",
   "description": "noun: the arrangement of and relations between the parts or elements of something complex",
   "repository": {
     "type": "git",
@@ -26,8 +26,8 @@
   },
   "dependencies": {
     "@babel/runtime-corejs3": "7.27.6",
-    "@cedarjs/project-config": "1.1.1-next.21+77cfbaa90",
-    "@prisma/internals": "6.19.0",
+    "@cedarjs/project-config": "1.1.1-rc.3",
+    "@prisma/internals": "5.20.0",
     "@types/line-column": "1.0.2",
     "camelcase": "6.3.0",
     "core-js": "3.42.0",
@@ -63,5 +63,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "77cfbaa90a726923a763fb33b836638d94b2d431"
+  "gitHead": "1332c50070b0ab7f2cfc0d7bc802c60cd8a664a9"
 }