@cedarjs/structure 2.2.2-next.0 → 2.2.2-next.31

package/dist/model/RWProject.js

@@ -10,12 +10,13 @@ var _map = _interopRequireDefault(require("@babel/runtime-corejs3/core-js/instan
 var _filter = _interopRequireDefault(require("@babel/runtime-corejs3/core-js/instance/filter"));
 var _getOwnPropertyDescriptor = _interopRequireDefault(require("@babel/runtime-corejs3/core-js/object/get-own-property-descriptor"));
 var _applyDecoratedDescriptor2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/applyDecoratedDescriptor"));
-var _path = require("path");
+var _nodeFs = require("node:fs");
+var _nodePath = require("node:path");
 var _internals = require("@prisma/internals");
 var _projectConfig = require("@cedarjs/project-config");
-var _ide = require("../ide");
+var _nodes = require("../nodes");
 var _decorators = require("../x/decorators");
-var _path2 = require("../x/path");
+var _path = require("../x/path");
 var _URL = require("../x/URL");
 var _RWCell = require("./RWCell");
 var _RWComponent = require("./RWComponent");
@@ -34,7 +35,7 @@ const allFilesGlob = '/**/*.{js,jsx,ts,tsx}';
  * Represents a Redwood project.
  * 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 _ide.BaseNode {
+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();
     this.parent = undefined;
@@ -43,9 +44,6 @@ let RWProject = exports.RWProject = (_dec = (0, _decorators.lazy)(), _dec2 = (0,
     };
     this.opts = opts;
   }
-  get host() {
-    return this.opts.host;
-  }
   get projectRoot() {
     return this.opts.projectRoot;
   }
@@ -66,7 +64,7 @@ let RWProject = exports.RWProject = (_dec = (0, _decorators.lazy)(), _dec2 = (0,
    * Checks for the presence of a tsconfig.json at the root.
    */
   get isTypeScriptProject() {
-    return this.host.existsSync((0, _path.join)(this.pathHelper.web.base, 'tsconfig.json')) || this.host.existsSync((0, _path.join)(this.pathHelper.api.base, 'tsconfig.json'));
+    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() {
@@ -91,7 +89,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, _path.join)(this.projectRoot, 'redwood.toml'), this);
+    return new _RWTOML.RWTOML((0, _nodePath.join)(this.projectRoot, 'redwood.toml'), this);
   }
   get processPagesDir() {
     try {
@@ -111,38 +109,38 @@ let RWProject = exports.RWProject = (_dec = (0, _decorators.lazy)(), _dec2 = (0,
   servicesFilePath(name) {
     // name = blog,posts
     const ext = this.isTypeScriptProject ? '.ts' : '.js';
-    return (0, _path.join)(this.pathHelper.api.services, name, name + ext);
+    return (0, _nodePath.join)(this.pathHelper.api.services, name, name + ext);
   }
 
   // TODO: move to path helper
   get defaultNotFoundPageFilePath() {
     const ext = this.isTypeScriptProject ? '.tsx' : '.jsx';
-    return (0, _path.join)(this.pathHelper.web.pages, 'NotFoundPage', 'NotFoundPage' + ext);
+    return (0, _nodePath.join)(this.pathHelper.web.pages, 'NotFoundPage', 'NotFoundPage' + ext);
   }
   get services() {
     var _context3, _context4;
     // TODO: what is the official logic?
     // TODO: Support both `/services/todos/todos.js` AND `/services/todos.js`
-    return (0, _map.default)(_context3 = (0, _filter.default)(_context4 = this.host.globSync(this.pathHelper.api.services + allFilesGlob)).call(_context4, _path2.followsDirNameConvention)).call(_context3, x => new _RWService.RWService(x, this));
+    return (0, _map.default)(_context3 = (0, _filter.default)(_context4 = (0, _path.globSync)(this.pathHelper.api.services + allFilesGlob)).call(_context4, _path.followsDirNameConvention)).call(_context3, x => new _RWService.RWService(x, this));
   }
   get sdls() {
     var _context5;
-    return (0, _map.default)(_context5 = this.host.globSync(this.pathHelper.api.graphql + '/**/*.sdl.{js,ts}')).call(_context5, x => new _RWSDL.RWSDL(x, this));
+    return (0, _map.default)(_context5 = (0, _path.globSync)(this.pathHelper.api.graphql + '/**/*.sdl.{js,ts}')).call(_context5, x => new _RWSDL.RWSDL(x, this));
   }
   get layouts() {
     var _context6, _context7, _context8;
     // TODO: what is the official logic?
-    return (0, _map.default)(_context6 = (0, _filter.default)(_context7 = (0, _filter.default)(_context8 = this.host.globSync(this.pathHelper.web.layouts + allFilesGlob)).call(_context8, _path2.followsDirNameConvention)).call(_context7, _path2.isLayoutFileName)).call(_context6, x => new _RWLayout.RWLayout(x, this));
+    return (0, _map.default)(_context6 = (0, _filter.default)(_context7 = (0, _filter.default)(_context8 = (0, _path.globSync)(this.pathHelper.web.layouts + allFilesGlob)).call(_context8, _path.followsDirNameConvention)).call(_context7, _path.isLayoutFileName)).call(_context6, x => new _RWLayout.RWLayout(x, this));
   }
   get functions() {
     var _context9;
     // TODO: what is the official logic?
-    return (0, _map.default)(_context9 = this.host.globSync(this.pathHelper.api.functions + allFilesGlob)).call(_context9, x => new _RWFunction.RWFunction(x, this));
+    return (0, _map.default)(_context9 = (0, _path.globSync)(this.pathHelper.api.functions + allFilesGlob)).call(_context9, x => new _RWFunction.RWFunction(x, this));
   }
   get components() {
     var _context0;
-    return (0, _map.default)(_context0 = this.host.globSync(this.pathHelper.web.components + allFilesGlob)).call(_context0, file => {
-      if ((0, _path2.isCellFileName)(file)) {
+    return (0, _map.default)(_context0 = (0, _path.globSync)(this.pathHelper.web.components + allFilesGlob)).call(_context0, file => {
+      if ((0, _path.isCellFileName)(file)) {
         const possibleCell = new _RWCell.RWCell(file, this);
         return possibleCell.isCell ? possibleCell : new _RWComponent.RWComponent(file, this);
       }
@@ -155,7 +153,7 @@ let RWProject = exports.RWProject = (_dec = (0, _decorators.lazy)(), _dec2 = (0,
 
   // TODO: Wrap these in a real model.
   get mocks() {
-    return this.host.globSync(this.pathHelper.web.base + '/**/*.mock.{js,ts}');
+    return (0, _path.globSync)(this.pathHelper.web.base + '/**/*.mock.{js,ts}');
   }
 
   /**
@@ -164,7 +162,7 @@ let RWProject = exports.RWProject = (_dec = (0, _decorators.lazy)(), _dec2 = (0,
    **/
   get cells() {
     var _context1, _context10;
-    return (0, _filter.default)(_context1 = (0, _map.default)(_context10 = this.host.globSync(this.pathHelper.web.base + '/**/*Cell.{js,jsx,tsx}')).call(_context10, file => new _RWCell.RWCell(file, this))).call(_context1, file => file.isCell);
+    return (0, _filter.default)(_context1 = (0, _map.default)(_context10 = (0, _path.globSync)(this.pathHelper.web.base + '/**/*Cell.{js,jsx,tsx}')).call(_context10, file => new _RWCell.RWCell(file, this))).call(_context1, file => file.isCell);
   }
   get envHelper() {
     return new _RWEnvHelper.RWEnvHelper(this);

package/dist/model/RWRoute.d.ts

@@ -1,7 +1,6 @@
 import * as tsm from 'ts-morph';
-import type { Location } from 'vscode-languageserver-types';
-import type { Decoration, Definition, DocumentLinkX, HoverX } from '../ide';
-import { BaseNode } from '../ide';
+import { BaseNode } from '../nodes';
+import type { Location } from '../x/Location';
 import type { RWRouter } from './RWRouter';
 export declare class RWRoute extends BaseNode {
     /**
@@ -21,9 +20,6 @@ export declare class RWRoute extends BaseNode {
     get roles(): string | any[] | undefined;
     get hasParameters(): boolean;
     get hasPrerender(): boolean;
-    get outlineLabel(): string;
-    get outlineDescription(): string | undefined;
-    get outlineLink(): string;
     /**
      * The associated Redwood Page node, if any
      */
@@ -41,18 +37,9 @@ export declare class RWRoute extends BaseNode {
     get path_literal_node(): tsm.StringLiteral | undefined;
     get isNotFound(): boolean;
     get redirect(): string | undefined;
-    diagnostics(): Generator<import("../x/vscode-languageserver-types").ExtendedDiagnostic, void, unknown>;
-    ideInfo(): Generator<Definition | HoverX | Decoration | DocumentLinkX, void, any>;
+    diagnostics(): Generator<import("../x/diagnostics").ExtendedDiagnostic, void, unknown>;
     private get hasPathCollision();
     private getBoolAttr;
     private getStringAttr;
-    get parsedPath(): {
-        punctuationIndexes: number[];
-        slashIndexes: number[];
-        paramRanges: [number, number][];
-        paramTypeRanges: [number, number][];
-    } | undefined;
-    private decorations;
-    get sampleLocalPreviewURL(): string | undefined;
 }
 //# sourceMappingURL=RWRoute.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"RWRoute.d.ts","sourceRoot":"","sources":["../../src/model/RWRoute.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,GAAG,MAAM,UAAU,CAAA;AAC/B,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAA;AAI3D,OAAO,KAAK,EAAE,UAAU,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAA;AAC3E,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAA;AAajC,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AAG1C,qBAAa,OAAQ,SAAQ,QAAQ;IAEjC;;OAEG;IACI,OAAO,EAAE,GAAG,CAAC,qBAAqB;IAClC,MAAM,EAAE,QAAQ;;IAJvB;;OAEG;IACI,OAAO,EAAE,GAAG,CAAC,qBAAqB,EAClC,MAAM,EAAE,QAAQ;IAKzB,IAAY,EAAE,WAIb;IAED,IAAY,QAAQ,IAAI,QAAQ,CAE/B;IAED,IAAY,SAAS,YAOpB;IAED,IAAY,eAAe,uBAoB1B;IAED,IACI,KAAK,+BA0DR;IAED,IAAY,aAAa,IAAI,OAAO,CAMnC;IAED,IAAY,YAAY,YAEvB;IAED,IAAY,YAAY,IAAI,MAAM,CAKjC;IAED,IAAY,kBAAkB,IAAI,MAAM,GAAG,SAAS,CAMnD;IAED,IAAY,WAAW,IAAI,MAAM,CAGhC;IAED;;OAEG;IAEH,IAAY,IAAI,0CAOf;IACD;;OAEG;IACK,OAAO,KAAK,eAAe,GAelC;IACD,IAAY,mBAAmB,IAAI,MAAM,GAAG,SAAS,CAEpD;IACD,IAAY,IAAI,IAAI,MAAM,GAAG,SAAS,CAErC;IACD,IAAY,iBAAiB,IAAI,MAAM,GAAG,SAAS,CAWlD;IACD,IAAY,IAAI,IAAI,MAAM,GAAG,SAAS,CAErC;IAED,IAAY,SAAS,IAAI,OAAO,CAE/B;IAGD,IAAY,UAAU,IAAI,MAAM,GAAG,SAAS,CAE3C;IAED,IAAY,iBAAiB,kCAY5B;IAED,IAAY,UAAU,IAAI,OAAO,CAEhC;IAED,IAAY,QAAQ,uBAEnB;IAEA,WAAW;IA6BX,OAAO;IA4CA,OAAO,KAAK,gBAAgB,GAsBnC;IAED,OAAO,CAAC,WAAW;IAgCnB,OAAO,CAAC,aAAa;IAcrB,IAAY,UAAU;;;;;kBAKrB;IAED,OAAO,CAAE,WAAW;IAkCpB,IAAY,qBAAqB,IAAI,MAAM,GAAG,SAAS,CAStD;CACF"}
+{"version":3,"file":"RWRoute.d.ts","sourceRoot":"","sources":["../../src/model/RWRoute.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,GAAG,MAAM,UAAU,CAAA;AAG/B,OAAO,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAA;AAInC,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAA;AAE7C,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AAE1C,qBAAa,OAAQ,SAAQ,QAAQ;IAEjC;;OAEG;IACI,OAAO,EAAE,GAAG,CAAC,qBAAqB;IAClC,MAAM,EAAE,QAAQ;;IAJvB;;OAEG;IACI,OAAO,EAAE,GAAG,CAAC,qBAAqB,EAClC,MAAM,EAAE,QAAQ;IAKzB,IAAY,EAAE,WAIb;IAED,IAAY,QAAQ,IAAI,QAAQ,CAE/B;IAED,IAAY,SAAS,YAOpB;IAED,IAAY,eAAe,uBAoB1B;IAED,IACI,KAAK,+BA0DR;IAED,IAAY,aAAa,IAAI,OAAO,CAMnC;IAED,IAAY,YAAY,YAEvB;IAED;;OAEG;IAEH,IAAY,IAAI,0CAOf;IACD;;OAEG;IACK,OAAO,KAAK,eAAe,GAelC;IACD,IAAY,mBAAmB,IAAI,MAAM,GAAG,SAAS,CAEpD;IACD,IAAY,IAAI,IAAI,MAAM,GAAG,SAAS,CAErC;IACD,IAAY,iBAAiB,IAAI,MAAM,GAAG,SAAS,CAWlD;IACD,IAAY,IAAI,IAAI,MAAM,GAAG,SAAS,CAErC;IAED,IAAY,SAAS,IAAI,OAAO,CAE/B;IAGD,IAAY,UAAU,IAAI,MAAM,GAAG,SAAS,CAE3C;IAED,IAAY,iBAAiB,kCAY5B;IAED,IAAY,UAAU,IAAI,OAAO,CAEhC;IAED,IAAY,QAAQ,uBAEnB;IAEA,WAAW;IA8BJ,OAAO,KAAK,gBAAgB,GAsBnC;IAED,OAAO,CAAC,WAAW;IAgCnB,OAAO,CAAC,aAAa;CAatB"}

package/dist/model/RWRoute.js

@@ -15,20 +15,16 @@ var _filter = _interopRequireDefault(require("@babel/runtime-corejs3/core-js/ins
 var _map = _interopRequireDefault(require("@babel/runtime-corejs3/core-js/instance/map"));
 var _includes = _interopRequireDefault(require("@babel/runtime-corejs3/core-js/instance/includes"));
 var _find = _interopRequireDefault(require("@babel/runtime-corejs3/core-js/instance/find"));
-var _keys = _interopRequireDefault(require("@babel/runtime-corejs3/core-js/object/keys"));
 var _getOwnPropertyDescriptor = _interopRequireDefault(require("@babel/runtime-corejs3/core-js/object/get-own-property-descriptor"));
 var _applyDecoratedDescriptor2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/applyDecoratedDescriptor"));
-var _path = require("path");
 var tsm = _interopRequireWildcard(require("ts-morph"));
-var _vscodeLanguageserverTypes = require("vscode-languageserver-types");
 var _errors = require("../errors");
-var _ide = require("../ide");
+var _nodes = require("../nodes");
 var _util = require("../util");
 var _decorators = require("../x/decorators");
-var _vscodeLanguageserverTypes2 = require("../x/vscode-languageserver-types");
-var _advanced_path_parser = require("./util/advanced_path_parser");
-var _dec, _dec2, _dec3, _dec4, _dec5, _dec6, _dec7, _dec8, _dec9, _dec0, _dec1, _dec10, _dec11, _dec12, _dec13, _dec14, _dec15, _dec16, _dec17, _dec18, _dec19, _dec20, _dec21, _dec22, _class;
-let RWRoute = exports.RWRoute = (_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)(), _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)(), _dec18 = (0, _decorators.lazy)(), _dec19 = (0, _decorators.lazy)(), _dec20 = (0, _decorators.lazy)(), _dec21 = (0, _decorators.lazy)(), _dec22 = (0, _decorators.lazy)(), _class = class RWRoute extends _ide.BaseNode {
+var _diagnostics = require("../x/diagnostics");
+var _dec, _dec2, _dec3, _dec4, _dec5, _dec6, _dec7, _dec8, _dec9, _dec0, _dec1, _dec10, _dec11, _dec12, _dec13, _dec14, _dec15, _dec16, _dec17, _class;
+let RWRoute = exports.RWRoute = (_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)(), _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 RWRoute extends _nodes.BaseNode {
   constructor(
   /**
    * the <Route> tag
@@ -44,7 +40,7 @@ let RWRoute = exports.RWRoute = (_dec = (0, _decorators.lazy)(), _dec2 = (0, _de
     return this.parent.id + ' ' + this.jsxNode.getStart();
   }
   get location() {
-    return (0, _vscodeLanguageserverTypes2.LocationLike_toLocation)(this.jsxNode);
+    return (0, _diagnostics.LocationLike_toLocation)(this.jsxNode);
   }
   get isPrivate() {
     const tagText = this.jsxNode.getParentIfKind(tsm.SyntaxKind.JsxElement)?.getOpeningElement()?.getTagNameNode()?.getText();
@@ -128,23 +124,6 @@ let RWRoute = exports.RWRoute = (_dec = (0, _decorators.lazy)(), _dec2 = (0, _de
   get hasPrerender() {
     return this.prerender;
   }
-  get outlineLabel() {
-    if (this.isNotFound) {
-      return '404';
-    }
-    return this.path ?? '';
-  }
-  get outlineDescription() {
-    const fp = this.page?.filePath;
-    if (!fp) {
-      return undefined;
-    }
-    return (0, _path.basename)(fp);
-  }
-  get outlineLink() {
-    return (0, _vscodeLanguageserverTypes2.LocationLike_toHashLink)(this.location);
-    //return LocationLike_toTerminalLink(this.location)
-  }
 
   /**
    * The associated Redwood Page node, if any
@@ -228,69 +207,19 @@ let RWRoute = exports.RWRoute = (_dec = (0, _decorators.lazy)(), _dec2 = (0, _de
     if (this.page_identifier && !this.page) {
       // normally this would be caught by TypeScript
       // but Redwood has some "magic" import behavior going on
-      yield (0, _vscodeLanguageserverTypes2.err)(this.page_identifier, 'Page component not found');
+      yield (0, _diagnostics.err)(this.page_identifier, 'Page component not found');
     }
     if (this.path_errorMessage && this.path_literal_node) {
-      yield (0, _vscodeLanguageserverTypes2.err)(this.path_literal_node, this.path_errorMessage, _errors.RWError.INVALID_ROUTE_PATH_SYNTAX);
+      yield (0, _diagnostics.err)(this.path_literal_node, this.path_errorMessage, _errors.RWError.INVALID_ROUTE_PATH_SYNTAX);
     }
     if (this.hasPathCollision) {
-      yield (0, _vscodeLanguageserverTypes2.err)(this.path_literal_node, 'Duplicate Path');
+      yield (0, _diagnostics.err)(this.path_literal_node, 'Duplicate Path');
     }
     if (this.isPrivate && this.isNotFound) {
-      yield (0, _vscodeLanguageserverTypes2.err)(this.jsxNode, "The 'Not Found' page cannot be within a <PrivateSet> or a <Private> tag");
+      yield (0, _diagnostics.err)(this.jsxNode, "The 'Not Found' page cannot be within a <PrivateSet> or a <Private> tag");
     }
     if (this.isNotFound && this.path) {
-      yield (0, _vscodeLanguageserverTypes2.err)(this.path_literal_node, "The 'Not Found' page cannot have a path");
-    }
-  }
-  *ideInfo() {
-    // definition: page identifier --> page
-    if (this.page && this.page_identifier) {
-      yield {
-        kind: 'Definition',
-        location: (0, _vscodeLanguageserverTypes2.Location_fromNode)(this.page_identifier),
-        target: (0, _vscodeLanguageserverTypes2.Location_fromFilePath)(this.page.filePath)
-      };
-    }
-    if (this.path && this.page) {
-      // const location = Location_fromNode(this.jsxNode!)
-      // yield { kind: 'Hover', location, text: 'Open Preview' }
-    }
-    yield* this.decorations();
-    const {
-      sampleLocalPreviewURL
-    } = this;
-    if (sampleLocalPreviewURL) {
-      const range = (0, _vscodeLanguageserverTypes2.Range_fromNode)(this.jsxNode);
-      yield {
-        kind: 'Hover',
-        location: {
-          uri: this.parent.uri,
-          range
-        },
-        hover: {
-          range,
-          contents: `[Open Preview](${sampleLocalPreviewURL})`
-        }
-      };
-      const {
-        path_literal_node
-      } = this;
-      if (path_literal_node) {
-        const range = (0, _vscodeLanguageserverTypes2.Range_fromNode)(this.path_literal_node);
-        yield {
-          kind: 'DocumentLink',
-          location: {
-            uri: this.parent.uri,
-            range
-          },
-          link: {
-            range,
-            target: sampleLocalPreviewURL,
-            tooltip: sampleLocalPreviewURL
-          }
-        };
-      }
+      yield (0, _diagnostics.err)(this.path_literal_node, "The 'Not Found' page cannot have a path");
     }
   }
   get hasPathCollision() {
@@ -358,59 +287,4 @@ let RWRoute = exports.RWRoute = (_dec = (0, _decorators.lazy)(), _dec2 = (0, _de
     }
     return undefined;
   }
-  get parsedPath() {
-    if (!this.path) {
-      return undefined;
-    }
-    return (0, _advanced_path_parser.advanced_path_parser)(this.path);
-  }
-  *decorations() {
-    const pp = this.parsedPath;
-    if (!pp) {
-      return;
-    }
-    const uri = this.parent.uri;
-    const pos = (0, _vscodeLanguageserverTypes2.Range_fromNode)(this.path_literal_node).start;
-    const xxx = {
-      path_punctuation: pp.punctuationIndexes,
-      path_slash: pp.slashIndexes,
-      path_parameter: pp.paramRanges,
-      path_parameter_type: pp.paramTypeRanges
-    };
-    for (const style of (0, _keys.default)(xxx)) {
-      for (const x of xxx[style]) {
-        yield {
-          kind: 'Decoration',
-          style: style,
-          location: loc(x)
-        };
-      }
-    }
-    function loc(x) {
-      if (typeof x === 'number') {
-        return loc([x, x + 1]);
-      } else {
-        const start = (0, _vscodeLanguageserverTypes2.Position_translate)(pos, 0, x[0] + 1);
-        const end = (0, _vscodeLanguageserverTypes2.Position_translate)(pos, 0, x[1] + 1);
-        return {
-          uri,
-          range: _vscodeLanguageserverTypes.Range.create(start, end)
-        };
-      }
-    }
-  }
-
-  // TODO: we should get the URL of the server dynamically
-  get sampleLocalPreviewURL() {
-    const {
-      path
-    } = this;
-    if (!path) {
-      return undefined;
-    }
-    if ((0, _includes.default)(path).call(path, '{')) {
-      return undefined;
-    }
-    return `http://localhost:8910${path}`;
-  }
-}, (0, _applyDecoratedDescriptor2.default)(_class.prototype, "id", [_dec], (0, _getOwnPropertyDescriptor.default)(_class.prototype, "id"), _class.prototype), (0, _applyDecoratedDescriptor2.default)(_class.prototype, "location", [_dec2], (0, _getOwnPropertyDescriptor.default)(_class.prototype, "location"), _class.prototype), (0, _applyDecoratedDescriptor2.default)(_class.prototype, "isPrivate", [_dec3], (0, _getOwnPropertyDescriptor.default)(_class.prototype, "isPrivate"), _class.prototype), (0, _applyDecoratedDescriptor2.default)(_class.prototype, "unauthenticated", [_dec4], (0, _getOwnPropertyDescriptor.default)(_class.prototype, "unauthenticated"), _class.prototype), (0, _applyDecoratedDescriptor2.default)(_class.prototype, "roles", [_dec5], (0, _getOwnPropertyDescriptor.default)(_class.prototype, "roles"), _class.prototype), (0, _applyDecoratedDescriptor2.default)(_class.prototype, "hasParameters", [_dec6], (0, _getOwnPropertyDescriptor.default)(_class.prototype, "hasParameters"), _class.prototype), (0, _applyDecoratedDescriptor2.default)(_class.prototype, "hasPrerender", [_dec7], (0, _getOwnPropertyDescriptor.default)(_class.prototype, "hasPrerender"), _class.prototype), (0, _applyDecoratedDescriptor2.default)(_class.prototype, "outlineLabel", [_dec8], (0, _getOwnPropertyDescriptor.default)(_class.prototype, "outlineLabel"), _class.prototype), (0, _applyDecoratedDescriptor2.default)(_class.prototype, "outlineDescription", [_dec9], (0, _getOwnPropertyDescriptor.default)(_class.prototype, "outlineDescription"), _class.prototype), (0, _applyDecoratedDescriptor2.default)(_class.prototype, "outlineLink", [_dec0], (0, _getOwnPropertyDescriptor.default)(_class.prototype, "outlineLink"), _class.prototype), (0, _applyDecoratedDescriptor2.default)(_class.prototype, "page", [_dec1], (0, _getOwnPropertyDescriptor.default)(_class.prototype, "page"), _class.prototype), (0, _applyDecoratedDescriptor2.default)(_class.prototype, "page_identifier", [_dec10], (0, _getOwnPropertyDescriptor.default)(_class.prototype, "page_identifier"), _class.prototype), (0, _applyDecoratedDescriptor2.default)(_class.prototype, "page_identifier_str", [_dec11], (0, _getOwnPropertyDescriptor.default)(_class.prototype, "page_identifier_str"), _class.prototype), (0, _applyDecoratedDescriptor2.default)(_class.prototype, "name", [_dec12], (0, _getOwnPropertyDescriptor.default)(_class.prototype, "name"), _class.prototype), (0, _applyDecoratedDescriptor2.default)(_class.prototype, "path_errorMessage", [_dec13], (0, _getOwnPropertyDescriptor.default)(_class.prototype, "path_errorMessage"), _class.prototype), (0, _applyDecoratedDescriptor2.default)(_class.prototype, "path", [_dec14], (0, _getOwnPropertyDescriptor.default)(_class.prototype, "path"), _class.prototype), (0, _applyDecoratedDescriptor2.default)(_class.prototype, "prerender", [_dec15], (0, _getOwnPropertyDescriptor.default)(_class.prototype, "prerender"), _class.prototype), (0, _applyDecoratedDescriptor2.default)(_class.prototype, "renderMode", [_dec16], (0, _getOwnPropertyDescriptor.default)(_class.prototype, "renderMode"), _class.prototype), (0, _applyDecoratedDescriptor2.default)(_class.prototype, "path_literal_node", [_dec17], (0, _getOwnPropertyDescriptor.default)(_class.prototype, "path_literal_node"), _class.prototype), (0, _applyDecoratedDescriptor2.default)(_class.prototype, "isNotFound", [_dec18], (0, _getOwnPropertyDescriptor.default)(_class.prototype, "isNotFound"), _class.prototype), (0, _applyDecoratedDescriptor2.default)(_class.prototype, "redirect", [_dec19], (0, _getOwnPropertyDescriptor.default)(_class.prototype, "redirect"), _class.prototype), (0, _applyDecoratedDescriptor2.default)(_class.prototype, "hasPathCollision", [_dec20], (0, _getOwnPropertyDescriptor.default)(_class.prototype, "hasPathCollision"), _class.prototype), (0, _applyDecoratedDescriptor2.default)(_class.prototype, "parsedPath", [_dec21], (0, _getOwnPropertyDescriptor.default)(_class.prototype, "parsedPath"), _class.prototype), (0, _applyDecoratedDescriptor2.default)(_class.prototype, "sampleLocalPreviewURL", [_dec22], (0, _getOwnPropertyDescriptor.default)(_class.prototype, "sampleLocalPreviewURL"), _class.prototype), _class);
+}, (0, _applyDecoratedDescriptor2.default)(_class.prototype, "id", [_dec], (0, _getOwnPropertyDescriptor.default)(_class.prototype, "id"), _class.prototype), (0, _applyDecoratedDescriptor2.default)(_class.prototype, "location", [_dec2], (0, _getOwnPropertyDescriptor.default)(_class.prototype, "location"), _class.prototype), (0, _applyDecoratedDescriptor2.default)(_class.prototype, "isPrivate", [_dec3], (0, _getOwnPropertyDescriptor.default)(_class.prototype, "isPrivate"), _class.prototype), (0, _applyDecoratedDescriptor2.default)(_class.prototype, "unauthenticated", [_dec4], (0, _getOwnPropertyDescriptor.default)(_class.prototype, "unauthenticated"), _class.prototype), (0, _applyDecoratedDescriptor2.default)(_class.prototype, "roles", [_dec5], (0, _getOwnPropertyDescriptor.default)(_class.prototype, "roles"), _class.prototype), (0, _applyDecoratedDescriptor2.default)(_class.prototype, "hasParameters", [_dec6], (0, _getOwnPropertyDescriptor.default)(_class.prototype, "hasParameters"), _class.prototype), (0, _applyDecoratedDescriptor2.default)(_class.prototype, "hasPrerender", [_dec7], (0, _getOwnPropertyDescriptor.default)(_class.prototype, "hasPrerender"), _class.prototype), (0, _applyDecoratedDescriptor2.default)(_class.prototype, "page", [_dec8], (0, _getOwnPropertyDescriptor.default)(_class.prototype, "page"), _class.prototype), (0, _applyDecoratedDescriptor2.default)(_class.prototype, "page_identifier", [_dec9], (0, _getOwnPropertyDescriptor.default)(_class.prototype, "page_identifier"), _class.prototype), (0, _applyDecoratedDescriptor2.default)(_class.prototype, "page_identifier_str", [_dec0], (0, _getOwnPropertyDescriptor.default)(_class.prototype, "page_identifier_str"), _class.prototype), (0, _applyDecoratedDescriptor2.default)(_class.prototype, "name", [_dec1], (0, _getOwnPropertyDescriptor.default)(_class.prototype, "name"), _class.prototype), (0, _applyDecoratedDescriptor2.default)(_class.prototype, "path_errorMessage", [_dec10], (0, _getOwnPropertyDescriptor.default)(_class.prototype, "path_errorMessage"), _class.prototype), (0, _applyDecoratedDescriptor2.default)(_class.prototype, "path", [_dec11], (0, _getOwnPropertyDescriptor.default)(_class.prototype, "path"), _class.prototype), (0, _applyDecoratedDescriptor2.default)(_class.prototype, "prerender", [_dec12], (0, _getOwnPropertyDescriptor.default)(_class.prototype, "prerender"), _class.prototype), (0, _applyDecoratedDescriptor2.default)(_class.prototype, "renderMode", [_dec13], (0, _getOwnPropertyDescriptor.default)(_class.prototype, "renderMode"), _class.prototype), (0, _applyDecoratedDescriptor2.default)(_class.prototype, "path_literal_node", [_dec14], (0, _getOwnPropertyDescriptor.default)(_class.prototype, "path_literal_node"), _class.prototype), (0, _applyDecoratedDescriptor2.default)(_class.prototype, "isNotFound", [_dec15], (0, _getOwnPropertyDescriptor.default)(_class.prototype, "isNotFound"), _class.prototype), (0, _applyDecoratedDescriptor2.default)(_class.prototype, "redirect", [_dec16], (0, _getOwnPropertyDescriptor.default)(_class.prototype, "redirect"), _class.prototype), (0, _applyDecoratedDescriptor2.default)(_class.prototype, "hasPathCollision", [_dec17], (0, _getOwnPropertyDescriptor.default)(_class.prototype, "hasPathCollision"), _class.prototype), _class);

package/dist/model/RWRouter.d.ts

@@ -1,7 +1,5 @@
-import type { CodeAction } from 'vscode-languageserver-types';
-import type { CodeLensX } from '../ide';
-import { FileNode } from '../ide';
-import type { ExtendedDiagnostic } from '../x/vscode-languageserver-types';
+import { FileNode } from '../nodes';
+import type { ExtendedDiagnostic } from '../x/diagnostics';
 import type { RWProject } from './RWProject';
 import { RWRoute } from './RWRoute';
 /**
@@ -22,8 +20,6 @@ export declare class RWRouter extends FileNode {
      */
     get routes(): RWRoute[];
     private get numNotFoundPages();
-    ideInfo(): Generator<CodeLensX, void, unknown>;
-    get quickFix_addNotFoundpage(): CodeAction | undefined;
     diagnostics(): Generator<ExtendedDiagnostic, void, unknown>;
     children(): RWRoute[];
 }

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

@@ -1 +1 @@
-{"version":3,"file":"RWRouter.d.ts","sourceRoot":"","sources":["../../src/model/RWRouter.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAY,MAAM,6BAA6B,CAAA;AASvE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAA;AACvC,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAA;AAIjC,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,kCAAkC,CAAA;AAO1E,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AAC5C,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AAEnC;;GAEG;AACH,qBAAa,QAAS,SAAQ,QAAQ;IAE3B,QAAQ,EAAE,MAAM;IAChB,MAAM,EAAE,SAAS;gBADjB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,SAAS;IAKlB,uBAAuB,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;IAK9D,uBAAuB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;IAUrE;;OAEG;IACK,OAAO,KAAK,OAAO,GAI1B;IAED;;OAEG;IACH,IAAY,MAAM,cA+CjB;IAEO,OAAO,KAAK,gBAAgB,GAEnC;IAEA,OAAO;IAoBR,IAAY,wBAAwB,2BAoCnC;IAEA,WAAW;IAkCZ,QAAQ;CAGT"}
+{"version":3,"file":"RWRouter.d.ts","sourceRoot":"","sources":["../../src/model/RWRouter.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAA;AAGnC,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAA;AAK1D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AAC5C,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AAEnC;;GAEG;AACH,qBAAa,QAAS,SAAQ,QAAQ;IAE3B,QAAQ,EAAE,MAAM;IAChB,MAAM,EAAE,SAAS;gBADjB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,SAAS;IAKlB,uBAAuB,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;IAK9D,uBAAuB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;IAUrE;;OAEG;IACK,OAAO,KAAK,OAAO,GAI1B;IAED;;OAEG;IACH,IAAY,MAAM,cA+CjB;IAEO,OAAO,KAAK,gBAAgB,GAEnC;IAEA,WAAW;IAiCZ,QAAQ;CAGT"}

package/dist/model/RWRouter.js

@@ -11,23 +11,21 @@ var _find = _interopRequireDefault(require("@babel/runtime-corejs3/core-js/insta
 var _includes = _interopRequireDefault(require("@babel/runtime-corejs3/core-js/instance/includes"));
 var _bind = _interopRequireDefault(require("@babel/runtime-corejs3/core-js/instance/bind"));
 var _filter = _interopRequireDefault(require("@babel/runtime-corejs3/core-js/instance/filter"));
-var _repeat = _interopRequireDefault(require("@babel/runtime-corejs3/core-js/instance/repeat"));
 var _getOwnPropertyDescriptor = _interopRequireDefault(require("@babel/runtime-corejs3/core-js/object/get-own-property-descriptor"));
 var _applyDecoratedDescriptor2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/applyDecoratedDescriptor"));
 var tsm = _interopRequireWildcard(require("ts-morph"));
-var _vscodeLanguageserverTypes = require("vscode-languageserver-types");
 var _errors = require("../errors");
-var _ide = require("../ide");
+var _nodes = require("../nodes");
 var _Array = require("../x/Array");
 var _decorators = require("../x/decorators");
+var _diagnostics = require("../x/diagnostics");
 var _URL = require("../x/URL");
-var _vscodeLanguageserverTypes2 = require("../x/vscode-languageserver-types");
 var _RWRoute = require("./RWRoute");
-var _dec, _dec2, _dec3, _dec4, _dec5, _dec6, _class;
+var _dec, _dec2, _dec3, _dec4, _dec5, _class;
 /**
  * one per Routes.js
  */
-let RWRouter = exports.RWRouter = (_dec = (0, _decorators.memo)(), _dec2 = (0, _decorators.memo)(), _dec3 = (0, _decorators.lazy)(), _dec4 = (0, _decorators.lazy)(), _dec5 = (0, _decorators.lazy)(), _dec6 = (0, _decorators.lazy)(), _class = class RWRouter extends _ide.FileNode {
+let RWRouter = exports.RWRouter = (_dec = (0, _decorators.memo)(), _dec2 = (0, _decorators.memo)(), _dec3 = (0, _decorators.lazy)(), _dec4 = (0, _decorators.lazy)(), _dec5 = (0, _decorators.lazy)(), _class = class RWRouter extends _nodes.FileNode {
   constructor(filePath, parent) {
     super();
     this.filePath = filePath;
@@ -100,61 +98,12 @@ let RWRouter = exports.RWRouter = (_dec = (0, _decorators.memo)(), _dec2 = (0, _
     var _context7;
     return (0, _filter.default)(_context7 = this.routes).call(_context7, r => r.isNotFound).length;
   }
-  *ideInfo() {
-    if (this.jsxNode) {
-      const location = (0, _vscodeLanguageserverTypes2.Location_fromNode)(this.jsxNode);
-      const codeLens = {
-        range: location.range,
-        command: _vscodeLanguageserverTypes.Command.create('Create Page...', 'redwoodjs.cli', 'generate page...', this.parent.projectRoot)
-      };
-      yield {
-        kind: 'CodeLens',
-        location,
-        codeLens
-      };
-    }
-  }
-  get quickFix_addNotFoundpage() {
-    var _context8, _context9;
-    if (!this.jsxNode) {
-      return undefined;
-    }
-    const change = new _vscodeLanguageserverTypes.WorkspaceChange({
-      documentChanges: []
-    });
-    let uri = (0, _URL.URL_file)(this.parent.defaultNotFoundPageFilePath);
-    const p = (0, _find.default)(_context8 = this.parent.pages).call(_context8, p => p.basenameNoExt === 'NotFoundPage');
-    if (p) {
-      uri = p.uri;
-      // page already exists, we just need to add the <Route/>
-    } else {
-      change.createFile(uri);
-      change.getTextEditChange({
-        uri,
-        version: null
-      }).insert(_vscodeLanguageserverTypes.Position.create(0, 0), `export default () => <div>Not Found</div>`);
-    }
-    // add <Route/>
-    const loc = (0, _vscodeLanguageserverTypes2.LocationLike_toLocation)(this.jsxNode);
-    const lastRoute = this.routes[this.routes.length - 1];
-    const lastRouteLoc = (0, _vscodeLanguageserverTypes2.LocationLike_toLocation)(lastRoute.jsxNode);
-    const textEditChange = change.getTextEditChange({
-      uri: loc.uri,
-      version: null
-    });
-    const indent = (0, _repeat.default)(_context9 = ' ').call(_context9, lastRouteLoc.range.start.character);
-    textEditChange.insert(lastRouteLoc.range.end, `\n${indent}<Route notfound page={NotFoundPage}/>\n`);
-    return {
-      title: 'Create default Not Found Page',
-      edit: change.edit
-    };
-  }
   *diagnostics() {
     if (!this.fileExists) {
       // should we assign this error to the project? to redwood.toml?
       const uri = (0, _URL.URL_file)(this.parent.projectRoot, 'redwood.toml');
       const message = `Routes.js does not exist`;
-      yield (0, _vscodeLanguageserverTypes2.err)(uri, message);
+      yield (0, _diagnostics.err)(uri, message);
       // TODO: add quickFix (create a simple Routes.js)
       return; // stop checking for errors if the file doesn't exist
     }
@@ -165,22 +114,21 @@ let RWRouter = exports.RWRouter = (_dec = (0, _decorators.memo)(), _dec2 = (0, _
       const {
         uri,
         range
-      } = (0, _vscodeLanguageserverTypes2.LocationLike_toLocation)(this.jsxNode);
+      } = (0, _diagnostics.LocationLike_toLocation)(this.jsxNode);
       yield {
         uri,
         diagnostic: {
           range,
           message: "You must specify a 'notfound' page",
-          severity: _vscodeLanguageserverTypes.DiagnosticSeverity.Error
-        },
-        quickFix: async () => this.quickFix_addNotFoundpage
+          severity: _diagnostics.DiagnosticSeverity.Error
+        }
       };
     } else if (this.numNotFoundPages > 1) {
-      const e = (0, _vscodeLanguageserverTypes2.err)(this.jsxNode, "You must specify exactly one 'notfound' page", _errors.RWError.NOTFOUND_PAGE_NOT_DEFINED);
+      const e = (0, _diagnostics.err)(this.jsxNode, "You must specify exactly one 'notfound' page", _errors.RWError.NOTFOUND_PAGE_NOT_DEFINED);
       yield e;
     }
   }
   children() {
     return [...this.routes];
   }
-}, (0, _applyDecoratedDescriptor2.default)(_class.prototype, "getFilePathForRoutePath", [_dec], (0, _getOwnPropertyDescriptor.default)(_class.prototype, "getFilePathForRoutePath"), _class.prototype), (0, _applyDecoratedDescriptor2.default)(_class.prototype, "getRoutePathForFilePath", [_dec2], (0, _getOwnPropertyDescriptor.default)(_class.prototype, "getRoutePathForFilePath"), _class.prototype), (0, _applyDecoratedDescriptor2.default)(_class.prototype, "jsxNode", [_dec3], (0, _getOwnPropertyDescriptor.default)(_class.prototype, "jsxNode"), _class.prototype), (0, _applyDecoratedDescriptor2.default)(_class.prototype, "routes", [_dec4], (0, _getOwnPropertyDescriptor.default)(_class.prototype, "routes"), _class.prototype), (0, _applyDecoratedDescriptor2.default)(_class.prototype, "numNotFoundPages", [_dec5], (0, _getOwnPropertyDescriptor.default)(_class.prototype, "numNotFoundPages"), _class.prototype), (0, _applyDecoratedDescriptor2.default)(_class.prototype, "quickFix_addNotFoundpage", [_dec6], (0, _getOwnPropertyDescriptor.default)(_class.prototype, "quickFix_addNotFoundpage"), _class.prototype), _class);
+}, (0, _applyDecoratedDescriptor2.default)(_class.prototype, "getFilePathForRoutePath", [_dec], (0, _getOwnPropertyDescriptor.default)(_class.prototype, "getFilePathForRoutePath"), _class.prototype), (0, _applyDecoratedDescriptor2.default)(_class.prototype, "getRoutePathForFilePath", [_dec2], (0, _getOwnPropertyDescriptor.default)(_class.prototype, "getRoutePathForFilePath"), _class.prototype), (0, _applyDecoratedDescriptor2.default)(_class.prototype, "jsxNode", [_dec3], (0, _getOwnPropertyDescriptor.default)(_class.prototype, "jsxNode"), _class.prototype), (0, _applyDecoratedDescriptor2.default)(_class.prototype, "routes", [_dec4], (0, _getOwnPropertyDescriptor.default)(_class.prototype, "routes"), _class.prototype), (0, _applyDecoratedDescriptor2.default)(_class.prototype, "numNotFoundPages", [_dec5], (0, _getOwnPropertyDescriptor.default)(_class.prototype, "numNotFoundPages"), _class.prototype), _class);

package/dist/model/RWSDL.d.ts

@@ -1,5 +1,5 @@
 import * as tsm from 'ts-morph';
-import { FileNode } from '../ide';
+import { FileNode } from '../nodes';
 import type { RWProject } from './RWProject';
 import { RWSDLField } from './RWSDLField';
 export declare class RWSDL extends FileNode {
@@ -16,6 +16,6 @@ export declare class RWSDL extends FileNode {
     get name(): string;
     get implementableFields(): RWSDLField[];
     children(): RWSDLField[];
-    diagnostics(): Generator<import("../x/vscode-languageserver-types").ExtendedDiagnostic, void, unknown>;
+    diagnostics(): Generator<import("../x/diagnostics").ExtendedDiagnostic, void, unknown>;
 }
 //# sourceMappingURL=RWSDL.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"RWSDL.d.ts","sourceRoot":"","sources":["../../src/model/RWSDL.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,GAAG,MAAM,UAAU,CAAA;AAG/B,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAA;AAKjC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AAC5C,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AAEzC,qBAAa,KAAM,SAAQ,QAAQ;IAExB,QAAQ,EAAE,MAAM;IAChB,MAAM,EAAE,SAAS;gBADjB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,SAAS;IAI1B;;OAEG;IACH,IAAY,gBAAgB,kDAa3B;IACD,IAAY,YAAY,IAAI,MAAM,GAAG,SAAS,CAE7C;IACD,IAAY,eAAe,WAE1B;IACD,IAAY,OAAO,gDAElB;IACD,IAAY,IAAI,WAIf;IACD,IAAY,mBAAmB,iBAkB9B;IAED,QAAQ;IAGP,WAAW;CASb"}
+{"version":3,"file":"RWSDL.d.ts","sourceRoot":"","sources":["../../src/model/RWSDL.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,GAAG,MAAM,UAAU,CAAA;AAG/B,OAAO,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAA;AAKnC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AAC5C,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AAEzC,qBAAa,KAAM,SAAQ,QAAQ;IAExB,QAAQ,EAAE,MAAM;IAChB,MAAM,EAAE,SAAS;gBADjB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,SAAS;IAI1B;;OAEG;IACH,IAAY,gBAAgB,kDAa3B;IACD,IAAY,YAAY,IAAI,MAAM,GAAG,SAAS,CAE7C;IACD,IAAY,eAAe,WAE1B;IACD,IAAY,OAAO,gDAElB;IACD,IAAY,IAAI,WAIf;IACD,IAAY,mBAAmB,iBAkB9B;IAED,QAAQ;IAGP,WAAW;CASb"}

package/dist/model/RWSDL.js

@@ -15,13 +15,13 @@ var _graphql = require("graphql");
 var _parser = require("graphql/language/parser");
 var tsm = _interopRequireWildcard(require("ts-morph"));
 var _errors = require("../errors");
-var _ide = require("../ide");
+var _nodes = require("../nodes");
 var _Array = require("../x/Array");
 var _decorators = require("../x/decorators");
-var _vscodeLanguageserverTypes = require("../x/vscode-languageserver-types");
+var _diagnostics = require("../x/diagnostics");
 var _RWSDLField = require("./RWSDLField");
 var _dec, _dec2, _dec3, _dec4, _dec5, _dec6, _class;
-let RWSDL = exports.RWSDL = (_dec = (0, _decorators.lazy)(), _dec2 = (0, _decorators.lazy)(), _dec3 = (0, _decorators.lazy)(), _dec4 = (0, _decorators.lazy)(), _dec5 = (0, _decorators.lazy)(), _dec6 = (0, _decorators.lazy)(), _class = class RWSDL extends _ide.FileNode {
+let RWSDL = exports.RWSDL = (_dec = (0, _decorators.lazy)(), _dec2 = (0, _decorators.lazy)(), _dec3 = (0, _decorators.lazy)(), _dec4 = (0, _decorators.lazy)(), _dec5 = (0, _decorators.lazy)(), _dec6 = (0, _decorators.lazy)(), _class = class RWSDL extends _nodes.FileNode {
   constructor(filePath, parent) {
     super();
     this.filePath = filePath;
@@ -83,7 +83,7 @@ let RWSDL = exports.RWSDL = (_dec = (0, _decorators.lazy)(), _dec2 = (0, _decora
   }
   *diagnostics() {
     if (!this.schemaStringNode) {
-      yield (0, _vscodeLanguageserverTypes.err)(this.uri, "Each SDL file must export a variable named 'schema' with a GraphQL schema string", _errors.RWError.SCHEMA_NOT_DEFINED);
+      yield (0, _diagnostics.err)(this.uri, "Each SDL file must export a variable named 'schema' with a GraphQL schema string", _errors.RWError.SCHEMA_NOT_DEFINED);
     }
   }
 }, (0, _applyDecoratedDescriptor2.default)(_class.prototype, "schemaStringNode", [_dec], (0, _getOwnPropertyDescriptor.default)(_class.prototype, "schemaStringNode"), _class.prototype), (0, _applyDecoratedDescriptor2.default)(_class.prototype, "schemaString", [_dec2], (0, _getOwnPropertyDescriptor.default)(_class.prototype, "schemaString"), _class.prototype), (0, _applyDecoratedDescriptor2.default)(_class.prototype, "serviceFilePath", [_dec3], (0, _getOwnPropertyDescriptor.default)(_class.prototype, "serviceFilePath"), _class.prototype), (0, _applyDecoratedDescriptor2.default)(_class.prototype, "service", [_dec4], (0, _getOwnPropertyDescriptor.default)(_class.prototype, "service"), _class.prototype), (0, _applyDecoratedDescriptor2.default)(_class.prototype, "name", [_dec5], (0, _getOwnPropertyDescriptor.default)(_class.prototype, "name"), _class.prototype), (0, _applyDecoratedDescriptor2.default)(_class.prototype, "implementableFields", [_dec6], (0, _getOwnPropertyDescriptor.default)(_class.prototype, "implementableFields"), _class.prototype), _class);

package/dist/model/RWSDLField.d.ts

@@ -1,8 +1,7 @@
 import type { FieldDefinitionNode, ObjectTypeDefinitionNode } from 'graphql/language/ast';
-import type { CodeAction, Location } from 'vscode-languageserver-types';
-import type { Implementation } from '../ide';
-import { BaseNode } from '../ide';
-import type { ExtendedDiagnostic } from '../x/vscode-languageserver-types';
+import { BaseNode } from '../nodes';
+import type { ExtendedDiagnostic } from '../x/diagnostics';
+import type { Location } from '../x/Location';
 import type { RWSDL } from './RWSDL';
 import type { RWServiceFunction } from './RWServiceFunction';
 export declare class RWSDLField extends BaseNode {
@@ -18,14 +17,11 @@ export declare class RWSDLField extends BaseNode {
     get location(): Location;
     get name(): string;
     get argumentNames(): string[];
-    ideInfo(): Generator<Implementation, void, unknown>;
     /**
      * TODO: describe in prose what is going on here.
      * this is an important rule
      */
     get impl(): RWServiceFunction | undefined;
-    private get defaultImplSnippet();
-    get quickFix_addImplementation(): CodeAction;
     diagnostics(): Generator<ExtendedDiagnostic, void, unknown>;
 }
 //# sourceMappingURL=RWSDLField.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"RWSDLField.d.ts","sourceRoot":"","sources":["../../src/model/RWSDLField.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,mBAAmB,EACnB,wBAAwB,EACzB,MAAM,sBAAsB,CAAA;AAC7B,OAAO,KAAK,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAA;AAQvE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,QAAQ,CAAA;AAC5C,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAA;AAGjC,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,kCAAkC,CAAA;AAM1E,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,SAAS,CAAA;AACpC,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAA;AAE5D,qBAAa,UAAW,SAAQ,QAAQ;IAE7B,aAAa,EAAE,wBAAwB;IACvC,KAAK,EAAE,mBAAmB;IAC1B,MAAM,EAAE,KAAK;gBAFb,aAAa,EAAE,wBAAwB,EACvC,KAAK,EAAE,mBAAmB,EAC1B,MAAM,EAAE,KAAK;IAItB,IAAY,EAAE,WAIb;IACD;;;OAGG;IACH,IAAY,QAAQ,IAAI,QAAQ,CAQ/B;IACD,IAAY,IAAI,WAEf;IACD,IAAY,aAAa,aAExB;IACA,OAAO;IASR;;;OAGG;IACH,IAAY,IAAI,IAAI,iBAAiB,GAAG,SAAS,CAEhD;IAEO,OAAO,KAAK,kBAAkB,GAOrC;IAED,IAAY,0BAA0B,IAAI,UAAU,CAuBnD;IAEA,WAAW;CAeb"}
+{"version":3,"file":"RWSDLField.d.ts","sourceRoot":"","sources":["../../src/model/RWSDLField.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,mBAAmB,EACnB,wBAAwB,EACzB,MAAM,sBAAsB,CAAA;AAG7B,OAAO,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAA;AAEnC,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAA;AAG1D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAA;AAE7C,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,SAAS,CAAA;AACpC,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAA;AAE5D,qBAAa,UAAW,SAAQ,QAAQ;IAE7B,aAAa,EAAE,wBAAwB;IACvC,KAAK,EAAE,mBAAmB;IAC1B,MAAM,EAAE,KAAK;gBAFb,aAAa,EAAE,wBAAwB,EACvC,KAAK,EAAE,mBAAmB,EAC1B,MAAM,EAAE,KAAK;IAItB,IAAY,EAAE,WAIb;IACD;;;OAGG;IACH,IAAY,QAAQ,IAAI,QAAQ,CAQ/B;IACD,IAAY,IAAI,WAEf;IACD,IAAY,aAAa,aAExB;IAED;;;OAGG;IACH,IAAY,IAAI,IAAI,iBAAiB,GAAG,SAAS,CAEhD;IAEA,WAAW;CAcb"}