@amagaki/amagaki 1.7.1 → 1.7.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/CHANGELOG.md CHANGED
@@ -1,5 +1,12 @@
1
1
  # Changelog
2
2
 
3
+ ### [1.7.2](https://www.github.com/blinkk/amagaki/compare/v1.7.1...v1.7.2) (2021-11-24)
4
+
5
+
6
+ ### Bug Fixes
7
+
8
+ * improve file watching and the dev server ([1c765e8](https://www.github.com/blinkk/amagaki/commit/1c765e801f266eff90c6d9d4be32587d3f751d79))
9
+
3
10
  ### [1.7.1](https://www.github.com/blinkk/amagaki/compare/v1.7.0...v1.7.1) (2021-11-24)
4
11
 
5
12
 
package/dist/src/cache.js CHANGED
@@ -20,6 +20,7 @@ class Cache {
20
20
  this.yamls = {};
21
21
  this.yamlStrings = {};
22
22
  this.yamlSchema = null;
23
+ this.pod.router.reset();
23
24
  }
24
25
  reset() {
25
26
  // TODO: Clear based on dependency graph and file type.
@@ -1 +1 @@
1
- {"version":3,"file":"cache.js","sourceRoot":"","sources":["../../src/cache.ts"],"names":[],"mappings":";;;AAUA,MAAa,KAAK;IAgBhB,YAAY,GAAQ;QAClB,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;QACf,IAAI,CAAC,QAAQ,EAAE,CAAC;IAClB,CAAC;IAED,QAAQ;QACN,IAAI,CAAC,WAAW,GAAG,EAAE,CAAC;QACtB,IAAI,CAAC,IAAI,GAAG,EAAE,CAAC;QACf,IAAI,CAAC,UAAU,GAAG,EAAE,CAAC;QACrB,IAAI,CAAC,cAAc,GAAG,EAAE,CAAC;QACzB,IAAI,CAAC,OAAO,GAAG,EAAE,CAAC;QAClB,IAAI,CAAC,QAAQ,GAAG,EAAE,CAAC;QACnB,IAAI,CAAC,MAAM,GAAG,EAAE,CAAC;QACjB,IAAI,CAAC,WAAW,GAAG,EAAE,CAAC;QACtB,IAAI,CAAC,OAAO,GAAG,EAAE,CAAC;QAClB,IAAI,CAAC,QAAQ,GAAG,IAAI,GAAG,EAAE,CAAC;QAC1B,IAAI,CAAC,KAAK,GAAG,EAAE,CAAC;QAChB,IAAI,CAAC,WAAW,GAAG,EAAE,CAAC;QACtB,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC;IACzB,CAAC;IAED,KAAK;QACH,uDAAuD;QACvD,IAAI,CAAC,QAAQ,EAAE,CAAC;IAClB,CAAC;CACF;AAzCD,sBAyCC"}
1
+ {"version":3,"file":"cache.js","sourceRoot":"","sources":["../../src/cache.ts"],"names":[],"mappings":";;;AAUA,MAAa,KAAK;IAgBhB,YAAY,GAAQ;QAClB,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;QACf,IAAI,CAAC,QAAQ,EAAE,CAAC;IAClB,CAAC;IAED,QAAQ;QACN,IAAI,CAAC,WAAW,GAAG,EAAE,CAAC;QACtB,IAAI,CAAC,IAAI,GAAG,EAAE,CAAC;QACf,IAAI,CAAC,UAAU,GAAG,EAAE,CAAC;QACrB,IAAI,CAAC,cAAc,GAAG,EAAE,CAAC;QACzB,IAAI,CAAC,OAAO,GAAG,EAAE,CAAC;QAClB,IAAI,CAAC,QAAQ,GAAG,EAAE,CAAC;QACnB,IAAI,CAAC,MAAM,GAAG,EAAE,CAAC;QACjB,IAAI,CAAC,WAAW,GAAG,EAAE,CAAC;QACtB,IAAI,CAAC,OAAO,GAAG,EAAE,CAAC;QAClB,IAAI,CAAC,QAAQ,GAAG,IAAI,GAAG,EAAE,CAAC;QAC1B,IAAI,CAAC,KAAK,GAAG,EAAE,CAAC;QAChB,IAAI,CAAC,WAAW,GAAG,EAAE,CAAC;QACtB,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC;QACvB,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;IAC1B,CAAC;IAED,KAAK;QACH,uDAAuD;QACvD,IAAI,CAAC,QAAQ,EAAE,CAAC;IAClB,CAAC;CACF;AA1CD,sBA0CC"}
@@ -17,6 +17,7 @@ export declare class Router {
17
17
  constructor(pod: Pod);
18
18
  resolve(path: string): Promise<Route | null>;
19
19
  warmup(): Promise<number>;
20
+ reset(): void;
20
21
  routes(): Promise<Route[]>;
21
22
  addProvider(provider: RouteProvider): void;
22
23
  /**
@@ -29,9 +30,10 @@ export declare class Router {
29
30
  export declare class RouteProvider {
30
31
  pod: Pod;
31
32
  router: Router;
32
- urlMap: Map<Document | StaticFile, Url>;
33
+ urlMap: Map<string, Url>;
33
34
  type: string;
34
35
  constructor(router: Router);
36
+ reset(): void;
35
37
  routes(): Promise<Route[]>;
36
38
  }
37
39
  export declare class DocumentRouteProvider extends RouteProvider {
@@ -64,6 +64,9 @@ class Router {
64
64
  await this.routes();
65
65
  return new Date().getTime() / 1000 - now;
66
66
  }
67
+ reset() {
68
+ Object.values(this.providers).map(providers => providers.map(provider => provider.reset && provider.reset()));
69
+ }
67
70
  async routes() {
68
71
  if (this.pod.cache.routes.length) {
69
72
  return this.pod.cache.routes;
@@ -110,7 +113,7 @@ class Router {
110
113
  throw Error(`RouteProvider not found for ${type}`);
111
114
  }
112
115
  for (const provider of providers) {
113
- const foundItem = provider.urlMap.get(item);
116
+ const foundItem = provider.urlMap.get(item.toString());
114
117
  if (foundItem) {
115
118
  return foundItem;
116
119
  }
@@ -126,6 +129,9 @@ class RouteProvider {
126
129
  this.urlMap = new Map();
127
130
  this.type = 'default';
128
131
  }
132
+ reset() {
133
+ this.urlMap = new Map();
134
+ }
129
135
  async routes() {
130
136
  return [];
131
137
  }
@@ -156,7 +162,7 @@ class CollectionRouteProvider extends RouteProvider {
156
162
  return;
157
163
  }
158
164
  routes.push(route);
159
- docProvider.urlMap.set(route.doc, route.url);
165
+ docProvider.urlMap.set(route.doc.toString(), route.url);
160
166
  };
161
167
  const docs = this.pod.docs();
162
168
  docs.forEach(doc => {
@@ -191,7 +197,7 @@ class StaticDirectoryRouteProvider extends RouteProvider {
191
197
  const subPath = podPath.slice(this.config.staticDir.length);
192
198
  const route = new StaticRoute(this, podPath, `${cleanPath}/${subPath}`);
193
199
  routes.push(route);
194
- this.urlMap.set(route.staticFile, route.url);
200
+ this.urlMap.set(route.staticFile.toString(), route.url);
195
201
  });
196
202
  }
197
203
  return routes;
@@ -1 +1 @@
1
- {"version":3,"file":"router.js","sourceRoot":"","sources":["../../src/router.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"router.js","sourceRoot":"","sources":["../../src/router.ts"],"names":[],"mappings":"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"}
@@ -30,8 +30,7 @@ export declare class Server extends events.EventEmitter {
30
30
  * Starts the web server.
31
31
  */
32
32
  start(): Promise<void>;
33
- /** Resets the pod cache and reinitializes the router. */
34
- resetCache(): Promise<void>;
33
+ private onchange;
35
34
  /**
36
35
  * Initializes a watcher and handles autoreloading and cache resetting.
37
36
  */
@@ -47,9 +47,12 @@ class Server extends events.EventEmitter {
47
47
  try {
48
48
  const route = await this.pod.router.resolve(req.path);
49
49
  if (!route) {
50
+ const ext = req.path.split('.').pop();
50
51
  const routes = (await this.pod.router.routes())
51
52
  .filter(route => {
52
- return (route.url.path.endsWith('/') || route.url.path.endsWith('.html'));
53
+ return (route.url.path.endsWith('/') ||
54
+ route.url.path.endsWith('.html') ||
55
+ (ext && route.url.path.endsWith(ext)));
53
56
  })
54
57
  .slice(0, 100);
55
58
  res.status(404).render('error-no-route.njk', {
@@ -101,38 +104,31 @@ class Server extends events.EventEmitter {
101
104
  this.watch();
102
105
  }
103
106
  }
104
- /** Resets the pod cache and reinitializes the router. */
105
- async resetCache() {
106
- // TODO: Clear based on dependency graph and file type.
107
- this.pod.cache.reset();
108
- // NOTE: Warm up the pod to ensure the router is populated for the dev
109
- // server. This is important when static files are added or removed or
110
- // when routes change via changes to `$path` or otherwise. This cannot
111
- // be done lazily at the moment because `router.getUrl` is sync whereas
112
- // warming up is async.
113
- await this.pod.warmup();
107
+ onchange(path) {
108
+ const reloadRegex = new RegExp(Server.AUTORELOAD_PATHS.join('|'));
109
+ const podPath = `/${path}`;
110
+ if (podPath.match(reloadRegex)) {
111
+ // TODO: Handle errors gracefully, so the developer can fix the error without
112
+ // needing to manually restart the server.
113
+ this.reload();
114
+ }
115
+ else {
116
+ this.pod.cache.reset();
117
+ }
114
118
  }
115
119
  /**
116
120
  * Initializes a watcher and handles autoreloading and cache resetting.
117
121
  */
118
122
  watch() {
119
123
  this.watcher = chokidar.watch(this.pod.root, {
120
- ignored: /node_modules/,
121
124
  cwd: this.pod.root,
125
+ ignored: ['**/node_modules/**', '**/.git/**'],
126
+ ignoreInitial: true,
122
127
  });
123
128
  // Reload the server or reset the cache when necessary.
124
- const reloadRegex = new RegExp(Server.AUTORELOAD_PATHS.join('|'));
125
- this.watcher.on('change', async (path) => {
126
- const podPath = `/${path}`;
127
- if (podPath.match(reloadRegex)) {
128
- // TODO: Handle errors gracefully, so the developer can fix the error without
129
- // needing to manually restart the server.
130
- this.reload();
131
- }
132
- else {
133
- await this.resetCache();
134
- }
135
- });
129
+ this.watcher.on('add', this.onchange.bind(this));
130
+ this.watcher.on('change', this.onchange.bind(this));
131
+ this.watcher.on('unlink', this.onchange.bind(this));
136
132
  }
137
133
  /**
138
134
  * Reinstantiates the pod and restarts the server, which has the side effect
@@ -1 +1 @@
1
- {"version":3,"file":"server.js","sourceRoot":"","sources":["../../src/server.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"server.js","sourceRoot":"","sources":["../../src/server.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@amagaki/amagaki",
3
- "version": "1.7.1",
3
+ "version": "1.7.2",
4
4
  "license": "MIT",
5
5
  "homepage": "https://amagaki.dev",
6
6
  "repository": {