@astrojs/ts-plugin 0.1.1 → 0.2.0

package/.turbo/turbo-build.log

@@ -0,0 +1,2 @@
+@astrojs/ts-plugin:build: cache hit, replaying output 74e970e8e478efe1
+@astrojs/ts-plugin:build: $ astro-scripts build "src/**/*.ts"

package/CHANGELOG.md

@@ -1,6 +1,13 @@
 # @astrojs/ts-plugin
 
+## 0.2.0
+
+### Minor Changes
+
+- 6b6b47a: Remove internal astro.d.ts files, instead prefer the one provided by Astro itself
+
 ## 0.1.1
+
 ### Patch Changes
 
 - f1f3091: Fix commenting, namespaced elements, and Fragment typings

package/README.md

@@ -0,0 +1,3 @@
+# @astrojs/ts-plugin
+
+Work in progress TypeScript plugin adding support for `.astro` imports with proper typing

package/dist/astro2tsx.js

@@ -24,9 +24,7 @@ __markAsModule(exports);
 __export(exports, {
   astro2tsx: () => astro2tsx
 });
-var import_fs = __toModule(require("fs"));
 var import_ts_morph = __toModule(require("ts-morph"));
-const ASTRO_DEFINITION = (0, import_fs.readFileSync)(require.resolve("../astro.d.ts"));
 function astro2tsx(code, options) {
   const compiled = transformContent(code);
   const result = {
@@ -37,7 +35,7 @@ function astro2tsx(code, options) {
   };
   return result;
 }
-function addProps(content, dtsContent) {
+function addProps(content) {
   let defaultExportType = "Record<string, any>";
   const project = new import_ts_morph.Project({});
   const sourceFile = project.createSourceFile("testing.ts", content);
@@ -45,15 +43,15 @@ function addProps(content, dtsContent) {
   if (declarations.has("Props")) {
     defaultExportType = "Props";
   }
-  return dtsContent + `
+  return `
 export default function (props: ${defaultExportType}): string;`;
 }
 function transformContent(content) {
   const ts = content.replace(/---/g, "///");
-  return ts + addProps(ts, ASTRO_DEFINITION.toString("utf-8"));
+  return ts + addProps(ts);
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   astro2tsx
 });
-//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vc3JjL2FzdHJvMnRzeC50cyJdLAogICJtYXBwaW5ncyI6ICI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQTtBQUFBO0FBQUE7QUFBQTtBQUNBLGdCQUE2QjtBQUM3QixzQkFBd0I7QUFHeEIsTUFBTSxtQkFBbUIsNEJBQTZCO0FBaUIvQyxtQkFBbUIsTUFBYyxTQUE0QztBQUNsRixRQUFNLFdBQVksaUJBQWlCO0FBRW5DLFFBQU0sU0FBMEI7QUFBQSxJQUM5QixNQUFNO0FBQUEsSUFDTixLQUFLO0FBQUEsTUFDSCxVQUFVO0FBQUE7QUFBQTtBQUlkLFNBQU87QUFBQTtBQUlULGtCQUFrQixTQUFpQixZQUE0QjtBQUM3RCxNQUFJLG9CQUFvQjtBQUd4QixRQUFNLFVBQVUsSUFBSSx3QkFBUTtBQUM1QixRQUFNLGFBQWEsUUFBUSxpQkFBaUIsY0FBYztBQUMxRCxRQUFNLGVBQWUsV0FBVztBQUNoQyxNQUFHLGFBQWEsSUFBSSxVQUFVO0FBQzVCLHdCQUFvQjtBQUFBO0FBRXRCLFNBQU8sYUFBYTtBQUFBLGtDQUEwQztBQUFBO0FBR2hFLDBCQUEwQixTQUFpQjtBQUN6QyxRQUFNLEtBQUssUUFBUSxRQUFRLFFBQVE7QUFDbkMsU0FDRSxLQUVBLFNBQVMsSUFBSSxpQkFBaUIsU0FBUztBQUFBOyIsCiAgIm5hbWVzIjogW10KfQo=
+//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vc3JjL2FzdHJvMnRzeC50cyJdLAogICJtYXBwaW5ncyI6ICI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQTtBQUFBO0FBQUE7QUFBQTtBQUNBLHNCQUF3QjtBQWlCakIsbUJBQW1CLE1BQWMsU0FBNEM7QUFDbEYsUUFBTSxXQUFXLGlCQUFpQjtBQUVsQyxRQUFNLFNBQTBCO0FBQUEsSUFDOUIsTUFBTTtBQUFBLElBQ04sS0FBSztBQUFBLE1BQ0gsVUFBVTtBQUFBO0FBQUE7QUFJZCxTQUFPO0FBQUE7QUFJVCxrQkFBa0IsU0FBeUI7QUFDekMsTUFBSSxvQkFBb0I7QUFHeEIsUUFBTSxVQUFVLElBQUksd0JBQVE7QUFDNUIsUUFBTSxhQUFhLFFBQVEsaUJBQWlCLGNBQWM7QUFDMUQsUUFBTSxlQUFlLFdBQVc7QUFDaEMsTUFBRyxhQUFhLElBQUksVUFBVTtBQUM1Qix3QkFBb0I7QUFBQTtBQUV0QixTQUFPO0FBQUEsa0NBQTBDO0FBQUE7QUFHbkQsMEJBQTBCLFNBQWlCO0FBQ3pDLFFBQU0sS0FBSyxRQUFRLFFBQVEsUUFBUTtBQUNuQyxTQUNFLEtBRUEsU0FBUztBQUFBOyIsCiAgIm5hbWVzIjogW10KfQo=

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@astrojs/ts-plugin",
-    "version": "0.1.1",
+    "version": "0.2.0",
     "description": "A TypeScript Plugin providing Astro intellisense",
     "main": "dist/index.js",
     "type": "commonjs",
@@ -14,7 +14,7 @@
         "build": "astro-scripts build \"src/**/*.ts\"",
         "dev": "astro-scripts dev \"src/**/*.ts\""
     },
-    "author": "Skypack",
+    "author": "withastro",
     "license": "MIT",
     "devDependencies": {
         "@tsconfig/node12": "^1.0.0",

package/src/astro2tsx.ts

@@ -1,10 +1,6 @@
 import type { FileMapping } from './source-mapper';
-import { readFileSync } from 'fs';
 import { Project } from 'ts-morph';
 
-
-const ASTRO_DEFINITION = readFileSync(require.resolve('../astro.d.ts'));
-
 // Note that this is a bit of a hack until the new compiler with proper
 // source map support.
 
@@ -21,7 +17,7 @@ interface Astro2TSXResult {
 }
 
 export function astro2tsx(code: string, options: Astro2TSXOptions): Astro2TSXResult {
-  const compiled =  transformContent(code);
+  const compiled = transformContent(code);
 
   const result: Astro2TSXResult = {
     code: compiled,
@@ -29,12 +25,12 @@ export function astro2tsx(code: string, options: Astro2TSXOptions): Astro2TSXRes
       mappings: []
     }
   };
-  
+
   return result;
 }
 
 // This is hacky but it works for now
-function addProps(content: string, dtsContent: string): string {
+function addProps(content: string): string {
   let defaultExportType = 'Record<string, any>';
 
   // See if this has an interface already
@@ -44,7 +40,7 @@ function addProps(content: string, dtsContent: string): string {
   if(declarations.has('Props')) {
     defaultExportType = 'Props';
   }
-  return dtsContent + '\n' + `export default function (props: ${defaultExportType}): string;`
+  return '\n' + `export default function (props: ${defaultExportType}): string;`
 }
 
 function transformContent(content: string) {
@@ -52,6 +48,6 @@ function transformContent(content: string) {
   return (
     ts +
     // Add TypeScript definitions
-    addProps(ts, ASTRO_DEFINITION.toString('utf-8'))
+    addProps(ts)
   );
-}
+}

package/astro.d.ts

@@ -1,29 +0,0 @@
-type AstroRenderedHTML = string;
-
-type FetchContentResult<ContentFrontmatter extends Record<string, any> = Record<string, any>> = {
-  astro: {
-    headers: string[];
-    source: string;
-    html: AstroRenderedHTML;
-  };
-  url: URL;
-} & ContentFrontmatter;
-
-interface AstroPageRequest {
-  url: URL;
-  canonicalURL: URL;
-}
-
-interface Astro {
-  isPage: boolean;
-  fetchContent<ContentFrontmatter>(globStr: string): FetchContentResult<ContentFrontmatter>[];
-  props: Record<string, number | string | any>;
-  request: AstroPageRequest;
-  site: URL;
-}
-
-declare var Astro: Astro;
-declare var Fragment: string;
-
-void Astro;
-void Fragment;