@cedarjs/structure 3.0.0-canary.13594 → 3.0.0-canary.13596

package/README.md

@@ -21,7 +21,7 @@ The most common use-case is getting the diagnostics of a complete Cedar project:
 ```ts
 import { getProject } from '@cedarjs/structure'
 async function test() {
-  const project = getProject('/path/to/app') // or "file:///path/to/app"
+  const project = getProject()
   for (const d of await project.collectDiagnostics()) {
     console.log(d.diagnostic.severity + ': ' + d.diagnostic.message)
   }

package/dist/index.d.ts

@@ -3,8 +3,8 @@ export { RWProject, RWRoute } from './model';
 export { URL_file } from './x/URL';
 import { RWProject } from './model';
 import type { GetSeverityLabelFunction } from './x/diagnostics';
-export declare function getProject(projectRoot: string): RWProject;
-export declare function printDiagnostics(projectRoot: string, opts?: {
+export declare function getProject(): RWProject;
+export declare function printDiagnostics(opts?: {
     getSeverityLabel?: GetSeverityLabelFunction;
 }): Promise<void>;
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAA;AACpD,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,SAAS,CAAA;AAC5C,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAA;AAClC,OAAO,EAAE,SAAS,EAAE,MAAM,SAAS,CAAA;AACnC,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,iBAAiB,CAAA;AAG/D,wBAAgB,UAAU,CAAC,WAAW,EAAE,MAAM,aAI7C;AAED,wBAAsB,gBAAgB,CACpC,WAAW,EAAE,MAAM,EACnB,IAAI,CAAC,EAAE;IAAE,gBAAgB,CAAC,EAAE,wBAAwB,CAAA;CAAE,iBA8BvD"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAA;AACpD,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,SAAS,CAAA;AAC5C,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAA;AAClC,OAAO,EAAE,SAAS,EAAE,MAAM,SAAS,CAAA;AACnC,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,iBAAiB,CAAA;AAG/D,wBAAgB,UAAU,cAEzB;AAED,wBAAsB,gBAAgB,CAAC,IAAI,CAAC,EAAE;IAC5C,gBAAgB,CAAC,EAAE,wBAAwB,CAAA;CAC5C,iBAkCA"}

package/dist/index.js

@@ -30,18 +30,18 @@ _Object$defineProperty(exports, "URL_file", {
 });
 exports.getProject = getProject;
 exports.printDiagnostics = printDiagnostics;
+var _projectConfig = require("@cedarjs/project-config");
 var _diagnostics = require("./x/diagnostics");
 var _model = require("./model");
 var _URL = require("./x/URL");
-function getProject(projectRoot) {
-  return new _model.RWProject({
-    projectRoot
-  });
+function getProject() {
+  return new _model.RWProject();
 }
-async function printDiagnostics(projectRoot, opts) {
-  const project = getProject(projectRoot);
+async function printDiagnostics(opts) {
+  const base = (0, _projectConfig.getPaths)().base;
+  const project = getProject();
   const formatOpts = {
-    cwd: projectRoot,
+    cwd: base,
     ...opts
   };
   try {
@@ -65,6 +65,9 @@ async function printDiagnostics(projectRoot, opts) {
       process.exit(1);
     }
   } catch (e) {
-    throw new Error(e.message);
+    if (e instanceof Error) {
+      throw e;
+    }
+    throw new Error(String(e));
   }
 }

package/dist/model/RWEnvHelper.js

@@ -84,7 +84,7 @@ let RWEnvHelper = exports.RWEnvHelper = (_dec = (0, _decorators.lazy)(), _dec2 =
     });
   }
   _dotenv(f) {
-    const file = (0, _nodePath.join)(this.parent.projectRoot, f);
+    const file = (0, _nodePath.join)(this.parent.pathHelper.base, f);
     if (!_nodeFs.default.existsSync(file)) {
       return undefined;
     }

package/dist/model/RWProject.d.ts

@@ -10,18 +10,12 @@ import { RWRouter } from './RWRouter';
 import { RWSDL } from './RWSDL';
 import { RWService } from './RWService';
 import { RWTOML } from './RWTOML';
-export interface RWProjectOptions {
-    projectRoot: string;
-}
 /**
  * Represents a Redwood project.
  * This is the root node.
  */
 export declare class RWProject extends BaseNode {
-    opts: RWProjectOptions;
-    constructor(opts: RWProjectOptions);
     parent: undefined;
-    get projectRoot(): string;
     get id(): string;
     children(): (RWComponent | RWTOML | RWPage | RWRouter | RWService | RWSDL | RWLayout | RWEnvHelper)[];
     /**

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

@@ -1 +1 @@
-{"version":3,"file":"RWProject.d.ts","sourceRoot":"","sources":["../../src/model/RWProject.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,0BAA0B,CAAA;AAUpD,OAAO,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAA;AAUnC,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;CACpB;AAID;;;GAGG;AACH,qBAAa,SAAU,SAAQ,QAAQ;IAClB,IAAI,EAAE,gBAAgB;gBAAtB,IAAI,EAAE,gBAAgB;IAGzC,MAAM,YAAY;IAElB,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,gBAMnB;IAED,IAAY,IAAI,YAIf;IAED,IAAY,OAAO,IAAI,QAAQ,EAAE,CAMhC;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,CAI5B;IAED,IAAY,SAAS,IAAI,WAAW,CAEnC;CACF"}
+{"version":3,"file":"RWProject.d.ts","sourceRoot":"","sources":["../../src/model/RWProject.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,0BAA0B,CAAA;AAUpD,OAAO,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAA;AAUnC,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;AAIjC;;;GAGG;AACH,qBAAa,SAAU,SAAQ,QAAQ;IACrC,MAAM,YAAY;IAElB,IAAY,EAAE,WAEb;IAED,QAAQ;IAaR;;OAEG;IACH,IAAY,UAAU,4CAErB;IAED;;OAEG;IACH,IAAY,mBAAmB,IAAI,OAAO,CAKzC;IAGa,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC,QAAQ,GAAG,SAAS,CAAC;IAYhD,oBAAoB;IAQlC,IAAY,WAAW,IAAI,MAAM,CAEhC;IAEO,OAAO,KAAK,eAAe,GAMlC;IAED,IAAY,KAAK,IAAI,MAAM,EAAE,CAI5B;IAED,IAAY,MAAM,aAEjB;IACD,SAAS,iBAER;IAGD,gBAAgB,CAAC,IAAI,EAAE,MAAM;IAO7B,IAAY,2BAA2B,WAGtC;IAED,IAAY,QAAQ,gBAMnB;IAED,IAAY,IAAI,YAIf;IAED,IAAY,OAAO,IAAI,QAAQ,EAAE,CAMhC;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,CAI5B;IAED,IAAY,SAAS,IAAI,WAAW,CAEnC;CACF"}

package/dist/model/RWProject.js

@@ -36,19 +36,15 @@ const allFilesGlob = '/**/*.{js,jsx,ts,tsx}';
  * This is the root node.
  */
 let RWProject = exports.RWProject = (_dec = (0, _decorators.lazy)(), _dec2 = (0, _decorators.lazy)(), _dec3 = (0, _decorators.lazy)(), _dec4 = (0, _decorators.memo)(), _dec5 = (0, _decorators.memo)(), _dec6 = (0, _decorators.lazy)(), _dec7 = (0, _decorators.lazy)(), _dec8 = (0, _decorators.lazy)(), _dec9 = (0, _decorators.lazy)(), _dec0 = (0, _decorators.lazy)(), _dec1 = (0, _decorators.lazy)(), _dec10 = (0, _decorators.lazy)(), _dec11 = (0, _decorators.lazy)(), _dec12 = (0, _decorators.lazy)(), _dec13 = (0, _decorators.lazy)(), _dec14 = (0, _decorators.lazy)(), _dec15 = (0, _decorators.lazy)(), _dec16 = (0, _decorators.lazy)(), _dec17 = (0, _decorators.lazy)(), _class = class RWProject extends _nodes.BaseNode {
-  constructor(opts) {
-    super();
+  constructor(...args) {
+    super(...args);
     this.parent = undefined;
     this.getRouter = () => {
       return new _RWRouter.RWRouter(this.pathHelper.web.routes, this);
     };
-    this.opts = opts;
-  }
-  get projectRoot() {
-    return this.opts.projectRoot;
   }
   get id() {
-    return (0, _URL.URL_file)(this.projectRoot);
+    return (0, _URL.URL_file)(this.pathHelper.base);
   }
   children() {
     return [this.redwoodTOML, ...this.pages, this.router, ...this.services, ...this.sdls, ...this.layouts, ...this.components, this.envHelper];
@@ -58,14 +54,16 @@ let RWProject = exports.RWProject = (_dec = (0, _decorators.lazy)(), _dec2 = (0,
    * Path constants that are relevant to a Redwood project.
    */
   get pathHelper() {
-    return (0, _projectConfig.getPaths)(this.projectRoot);
+    return (0, _projectConfig.getPaths)();
   }
+
   /**
    * Checks for the presence of a tsconfig.json at the root.
    */
   get isTypeScriptProject() {
     return (0, _nodeFs.existsSync)((0, _nodePath.join)(this.pathHelper.web.base, 'tsconfig.json')) || (0, _nodeFs.existsSync)((0, _nodePath.join)(this.pathHelper.api.base, 'tsconfig.json'));
   }
+
   // TODO: do we move this to a separate node? (ex: RWDatabase)
   async prismaDMMF() {
     try {
@@ -89,7 +87,7 @@ let RWProject = exports.RWProject = (_dec = (0, _decorators.lazy)(), _dec2 = (0,
     return (0, _map.default)(_context = dmmf.datamodel.models).call(_context, m => m.name);
   }
   get redwoodTOML() {
-    return new _RWTOML.RWTOML((0, _projectConfig.getConfigPath)(this.projectRoot), this);
+    return new _RWTOML.RWTOML((0, _projectConfig.getConfigPath)(), this);
   }
   get processPagesDir() {
     try {

package/dist/model/RWRouter.js

@@ -102,7 +102,7 @@ let RWRouter = exports.RWRouter = (_dec = (0, _decorators.memo)(), _dec2 = (0, _
   *diagnostics() {
     if (!this.fileExists) {
       // should we assign this error to the project? to cedar.toml?
-      const uri = (0, _URL.URL_file)((0, _projectConfig.getConfigPath)(this.parent.projectRoot));
+      const uri = (0, _URL.URL_file)((0, _projectConfig.getConfigPath)());
       const message = `Routes.js does not exist`;
       yield (0, _diagnostics.err)(uri, message);
       // TODO: add quickFix (create a simple Routes.js)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/structure",
-  "version": "3.0.0-canary.13594+c328b5028",
+  "version": "3.0.0-canary.13596+e3364d309",
   "description": "noun: the arrangement of and relations between the parts or elements of something complex",
   "repository": {
     "type": "git",
@@ -26,7 +26,7 @@
   },
   "dependencies": {
     "@babel/runtime-corejs3": "7.29.0",
-    "@cedarjs/project-config": "3.0.0-canary.13594",
+    "@cedarjs/project-config": "3.0.0-canary.13596",
     "@prisma/internals": "6.19.2",
     "@types/line-column": "1.0.2",
     "camelcase": "6.3.0",
@@ -40,7 +40,6 @@
     "lodash": "4.17.23",
     "lodash-decorators": "6.0.1",
     "lru-cache": "11.2.7",
-    "proxyquire": "2.1.3",
     "smol-toml": "1.6.0",
     "ts-morph": "23.0.0",
     "yargs-parser": "21.1.1"
@@ -56,5 +55,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "c328b50280fc6a5b1b34f5837394f6028aa32bd2"
+  "gitHead": "e3364d3098475cbd73b315c90f60845f69838bc1"
 }