@@ -7,7 +7,7 @@ import glob from 'tiny-glob/sync.js';
77import { mkdirp , rimraf } from '../utils.js' ;
88
99/** @param {string } content */
10- function convert_typescript ( content ) {
10+ async function convert_typescript ( content ) {
1111 let { code } = transform ( content , {
1212 transforms : [ 'typescript' ] ,
1313 disableESTransforms : true
@@ -19,7 +19,7 @@ function convert_typescript(content) {
1919 // Prettier strips 'unnecessary' parens from .ts files, we need to hack them back in
2020 code = code . replace ( / ( \/ \* \* @ t y p e .+ ? \* \/ ) ( .+ ?) \/ \* \* \* \/ / g, '$1($2)' ) ;
2121
22- return prettier . format ( code , {
22+ return await prettier . format ( code , {
2323 parser : 'babel' ,
2424 useTabs : true ,
2525 singleQuote : true ,
@@ -78,7 +78,8 @@ async function generate_templates(shared) {
7878 null : [ ]
7979 } ;
8080
81- glob ( '**/*' , { cwd, filesOnly : true , dot : true } ) . forEach ( ( name ) => {
81+ const files = glob ( '**/*' , { cwd, filesOnly : true , dot : true } ) ;
82+ for ( const name of files ) {
8283 // the package.template.json thing is a bit annoying — basically we want
8384 // to be able to develop and deploy the app from here, but have a different
8485 // package.json in newly created projects (based on package.template.json)
@@ -87,14 +88,14 @@ async function generate_templates(shared) {
8788 // TODO package-specific versions
8889 contents = contents . replace ( / w o r k s p a c e : \* / g, 'next' ) ;
8990 fs . writeFileSync ( `${ dir } , contents ) ;
90- return ;
91+ continue ;
9192 }
9293
9394 // ignore files that are written conditionally
94- if ( shared . has ( name ) ) return ;
95+ if ( shared . has ( name ) ) continue ;
9596
9697 // ignore contents of .gitignore or .ignore
97- if ( ! gitignore . accepts ( name ) || ! ignore . accepts ( name ) || name === '.ignore' ) return ;
98+ if ( ! gitignore . accepts ( name ) || ! ignore . accepts ( name ) || name === '.ignore' ) continue ;
9899
99100 if ( / \. ( t s | s v e l t e ) $ / . test ( name ) ) {
100101 const contents = fs . readFileSync ( path . join ( cwd , name ) , 'utf8' ) ;
@@ -103,7 +104,7 @@ async function generate_templates(shared) {
103104 if ( name . endsWith ( 'app.d.ts' ) ) types . checkjs . push ( { name, contents } ) ;
104105 types . typescript . push ( { name, contents } ) ;
105106 } else if ( name . endsWith ( '.ts' ) ) {
106- const js = convert_typescript ( contents ) ;
107+ const js = await convert_typescript ( contents ) ;
107108
108109 types . typescript . push ( {
109110 name,
@@ -125,9 +126,14 @@ async function generate_templates(shared) {
125126 // possible (e.g. preserving double line breaks). Sucrase is the best
126127 // tool for the job because it just removes the types; Prettier then
127128 // tidies up the end result
128- const js_contents = contents . replace (
129+ const js_contents = await replace_async (
130+ contents ,
129131 / < s c r i p t ( [ ^ > ] + ) > ( [ \s \S ] + ?) < \/ s c r i p t > / g,
130- ( m , attrs , typescript ) => {
132+ async (
133+ /** @type {any } */ m ,
134+ /** @type {string } */ attrs ,
135+ /** @type {string } */ typescript
136+ ) => {
131137 // Sucrase assumes 'unused' imports (which _are_ used, but only
132138 // in the markup) are type imports, and strips them. This step
133139 // prevents it from drawing that conclusion
@@ -149,14 +155,15 @@ async function generate_templates(shared) {
149155 disableESTransforms : true
150156 } ) . code . slice ( 0 , - suffix . length ) ;
151157
152- const contents = prettier
153- . format ( transformed , {
158+ const contents = (
159+ await prettier . format ( transformed , {
154160 parser : 'babel' ,
155161 useTabs : true ,
156162 singleQuote : true ,
157163 trailingComma : 'none' ,
158164 printWidth : 100
159165 } )
166+ )
160167 . trim ( )
161168 . replace ( / ^ ( .) / gm, '\t$1' ) ;
162169
@@ -184,7 +191,7 @@ async function generate_templates(shared) {
184191 mkdirp ( path . dirname ( dest ) ) ;
185192 fs . copyFileSync ( path . join ( cwd , name ) , dest ) ;
186193 }
187- } ) ;
194+ }
188195
189196 fs . copyFileSync ( meta_file , `${ dir } ) ;
190197 fs . writeFileSync (
@@ -196,6 +203,20 @@ async function generate_templates(shared) {
196203 }
197204}
198205
206+ /**
207+ * @param {string } string
208+ * @param {RegExp } regexp
209+ * @param {{ (m: any, attrs: string, typescript: string): Promise<string>; (arg0: any): any; } } replacer
210+ */
211+ async function replace_async ( string , regexp , replacer ) {
212+ const replacements = await Promise . all (
213+ // @ts -ignore
214+ Array . from ( string . matchAll ( regexp ) , ( match ) => replacer ( ...match ) )
215+ ) ;
216+ let i = 0 ;
217+ return string . replace ( regexp , ( ) => replacements [ i ++ ] ) ;
218+ }
219+
199220async function generate_shared ( ) {
200221 const cwd = path . resolve ( 'shared' ) ;
201222
@@ -205,7 +226,8 @@ async function generate_shared() {
205226 /** @type {Array<{ name: string, include: string[], exclude: string[], contents: string }> } */
206227 const files = [ ] ;
207228
208- glob ( '**/*' , { cwd, filesOnly : true , dot : true } ) . forEach ( ( file ) => {
229+ const globbed = glob ( '**/*' , { cwd, filesOnly : true , dot : true } ) ;
230+ for ( const file of globbed ) {
209231 const contents = fs . readFileSync ( path . join ( cwd , file ) , 'utf8' ) ;
210232
211233 /** @type {string[] } */
@@ -232,7 +254,7 @@ async function generate_shared() {
232254 if ( name . endsWith ( '.ts' ) && ! include . includes ( 'typescript' ) ) {
233255 // file includes types in TypeScript and JSDoc —
234256 // create .js file, with and without JSDoc
235- const js = convert_typescript ( contents ) ;
257+ const js = await convert_typescript ( contents ) ;
236258 const js_name = name . replace ( / \. t s $ / , '.js' ) ;
237259
238260 // typescript
@@ -265,7 +287,7 @@ async function generate_shared() {
265287 shared . add ( name ) ;
266288 files . push ( { name, include, exclude, contents } ) ;
267289 }
268- } ) ;
290+ }
269291
270292 files . sort ( ( a , b ) => a . include . length + a . exclude . length - ( b . include . length + b . exclude . length ) ) ;
271293
0 commit comments