Prepare to jsr

ventojs · Jun 14, 2024 · 8c53570 · 8c53570
1 parent e7a6696
commit 8c53570
Show file tree

Hide file tree

Showing 17 changed files with 33 additions and 31 deletions.
diff --git a/deps.ts b/deps.ts
@@ -1,7 +1,7 @@
 export * as path from "jsr:@std/[email protected]";
 export * as html from "jsr:@std/[email protected]";
 
-export * as astring from "https://deno.land/x/astring@v1.8.6/src/astring.js";
+export * as astring from "jsr:@davidbonnet/astring@1.8.6";
 export * as meriyah from "npm:[email protected]";
 export * as walker from "npm:[email protected]";
 export type * as ESTree from "npm:@types/[email protected]";
diff --git a/mod.ts b/mod.ts
@@ -22,7 +22,7 @@ export interface Options {
   autoescape?: boolean;
 }
 
-export default function (options: Options = {}) {
+export default function (options: Options = {}): Environment {
   const loader = typeof options.includes === "object"
     ? options.includes
     : new FileLoader(options.includes || Deno.cwd());

diff --git a/plugins/auto_trim.ts b/plugins/auto_trim.ts
@@ -1,5 +1,5 @@
 import type { Token } from "../src/tokenizer.ts";
-import type { Environment } from "../src/environment.ts";
+import type { Environment, Plugin } from "../src/environment.ts";
 
 export const defaultTags = [
   ">",
@@ -21,7 +21,9 @@ export const defaultTags = [
 
 export type AutoTrimOptions = { tags: string[] };
 
-export default function (options: AutoTrimOptions = { tags: defaultTags }) {
+export default function (
+  options: AutoTrimOptions = { tags: defaultTags },
+): Plugin {
   return (env: Environment) => {
     env.tokenPreprocessors.push((_, tokens) => autoTrim(tokens, options));
   };

diff --git a/plugins/echo.ts b/plugins/echo.ts
@@ -1,7 +1,7 @@
 import type { Token } from "../src/tokenizer.ts";
-import type { Environment } from "../src/environment.ts";
+import type { Environment, Plugin } from "../src/environment.ts";
 
-export default function () {
+export default function (): Plugin {
   return (env: Environment) => {
     env.tags.push(setTag);
   };

diff --git a/plugins/escape.ts b/plugins/escape.ts
@@ -1,7 +1,7 @@
 import { html } from "../deps.ts";
-import type { Environment } from "../src/environment.ts";
+import type { Environment, Plugin } from "../src/environment.ts";
 
-export default function () {
+export default function (): Plugin {
   return (env: Environment) => {
     // deno-lint-ignore no-explicit-any
     env.filters.escape = (value: any) =>

diff --git a/plugins/export.ts b/plugins/export.ts
@@ -1,7 +1,7 @@
 import type { Token } from "../src/tokenizer.ts";
-import type { Environment } from "../src/environment.ts";
+import type { Environment, Plugin } from "../src/environment.ts";
 
-export default function () {
+export default function (): Plugin {
   return (env: Environment) => {
     env.tags.push(exportTag);
   };

diff --git a/plugins/for.ts b/plugins/for.ts
@@ -1,7 +1,7 @@
 import type { Token } from "../src/tokenizer.ts";
-import type { Environment } from "../src/environment.ts";
+import type { Environment, Plugin } from "../src/environment.ts";
 
-export default function () {
+export default function (): Plugin {
   return (env: Environment) => {
     env.tags.push(forTag);
     env.utils.toIterator = toIterator;

diff --git a/plugins/function.ts b/plugins/function.ts
@@ -1,7 +1,7 @@
 import type { Token } from "../src/tokenizer.ts";
-import type { Environment } from "../src/environment.ts";
+import type { Environment, Plugin } from "../src/environment.ts";
 
-export default function () {
+export default function (): Plugin {
   return (env: Environment) => {
     env.tags.push(functionTag);
   };

diff --git a/plugins/if.ts b/plugins/if.ts
@@ -1,7 +1,7 @@
 import type { Token } from "../src/tokenizer.ts";
-import type { Environment } from "../src/environment.ts";
+import type { Environment, Plugin } from "../src/environment.ts";
 
-export default function () {
+export default function (): Plugin {
   return (env: Environment) => {
     env.tags.push(ifTag);
     env.tags.push(elseTag);

diff --git a/plugins/import.ts b/plugins/import.ts
@@ -1,6 +1,6 @@
-import type { Environment } from "../src/environment.ts";
+import type { Environment, Plugin } from "../src/environment.ts";
 
-export default function () {
+export default function (): Plugin {
   return (env: Environment) => {
     env.tags.push(importTag);
   };

diff --git a/plugins/include.ts b/plugins/include.ts
@@ -1,8 +1,8 @@
 import analyze from "../src/js.ts";
 import type { Token } from "../src/tokenizer.ts";
-import type { Environment } from "../src/environment.ts";
+import type { Environment, Plugin } from "../src/environment.ts";
 
-export default function () {
+export default function (): Plugin {
   return (env: Environment) => {
     env.tags.push(includeTag);
   };

diff --git a/plugins/js.ts b/plugins/js.ts
@@ -1,6 +1,6 @@
-import type { Environment } from "../src/environment.ts";
+import type { Environment, Plugin } from "../src/environment.ts";
 
-export default function () {
+export default function (): Plugin {
   return (env: Environment) => {
     env.tags.push(jsTag);
   };

diff --git a/plugins/layout.ts b/plugins/layout.ts
@@ -1,7 +1,7 @@
 import type { Token } from "../src/tokenizer.ts";
-import type { Environment } from "../src/environment.ts";
+import type { Environment, Plugin } from "../src/environment.ts";
 
-export default function () {
+export default function (): Plugin {
   return (env: Environment) => {
     env.tags.push(layoutTag);
   };

diff --git a/plugins/set.ts b/plugins/set.ts
@@ -1,7 +1,7 @@
 import type { Token } from "../src/tokenizer.ts";
-import type { Environment } from "../src/environment.ts";
+import type { Environment, Plugin } from "../src/environment.ts";
 
-export default function () {
+export default function (): Plugin {
   return (env: Environment) => {
     env.tags.push(setTag);
   };

diff --git a/plugins/trim.ts b/plugins/trim.ts
@@ -1,7 +1,7 @@
 import type { Token } from "../src/tokenizer.ts";
-import type { Environment } from "../src/environment.ts";
+import type { Environment, Plugin } from "../src/environment.ts";
 
-export default function () {
+export default function (): Plugin {
   return (env: Environment) => {
     env.tokenPreprocessors.push(trim);
   };

diff --git a/plugins/unescape.ts b/plugins/unescape.ts
@@ -1,7 +1,7 @@
 import { html } from "../deps.ts";
-import type { Environment } from "../src/environment.ts";
+import type { Environment, Plugin } from "../src/environment.ts";
 
-export default function () {
+export default function (): Plugin {
   return (env: Environment) => {
     // deno-lint-ignore no-explicit-any
     env.filters.unescape = (value: any) =>

diff --git a/src/environment.ts b/src/environment.ts
@@ -53,7 +53,7 @@ export interface Options {
 }
 
 export class Environment {
-  cache = new Map<string, Template>();
+  cache: Map<string, Template> = new Map();
   options: Options;
   tags: Tag[] = [];
   tokenPreprocessors: TokenPreprocessor[] = [];