@lightningjs/blits 0.6.9 → 0.6.11

package/src/lib/precompiler/precompiler.js

@@ -0,0 +1,64 @@
+/*
+ * Copyright 2023 Comcast Cable Communications Management, LLC
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import parser from '../templateparser/parser.js'
+import generator from '../codegenerator/generator.js'
+import path from 'path'
+
+export default (source, filePath) => {
+  if (
+    source.indexOf('Blits.Component(') > -1 ||
+    source.indexOf('Blits.Application(') > -1 ||
+    /=>\s*Component\(['"][A-Za-z]+['"],/s.test(source) // blits component
+  ) {
+    // get the start of the template key in de component configuration object
+    const templateKeyRegex = /template:\s*([`"'])*/g
+    const templateStartResult = templateKeyRegex.exec(source)
+
+    if (templateStartResult) {
+      const typeOfQuotesUsed = templateStartResult[1]
+      const templateStartIndex = templateStartResult.index
+
+      // get the template contents from the configuration object
+      const templateContentsRegex = new RegExp(`${typeOfQuotesUsed}([\\s\\S]*?)${typeOfQuotesUsed}`)
+      const templateContentResult = templateContentsRegex.exec(source.slice(templateStartIndex))
+      const templateEndIndex =
+        templateStartIndex + templateContentResult.index + templateContentResult[0].length
+
+      // Parse the template
+      let resourceName = 'Blits.Application'
+      if (source.indexOf('Blits.Component(') > -1) {
+        resourceName = source.match(/Blits\.Component\(['"](.*)['"]\s*,/)[1]
+      }
+      const componentPath = path.relative(process.cwd(), filePath)
+      const parsed = parser(templateContentResult[1], resourceName, null, componentPath)
+
+      // Generate the code
+      const code = generator.call({ components: {} }, parsed)
+
+      // Insert the code in the component using the 'code' key, replacing the template key
+      const replacement = `/* eslint-disable no-unused-vars */ \ncode: { render: ${code.render.toString()}, effects: [${code.effects.map(
+        (fn) => fn.toString()
+      )}], context: {}}`
+      const newSource =
+        source.substring(0, templateStartIndex) + replacement + source.substring(templateEndIndex)
+
+      return newSource
+    }
+  }
+  return source
+}

package/src/lib/setup/base.js

@@ -23,6 +23,7 @@ import Circle from '../../components/Circle.js'
 import RouterView from '../../components/RouterView.js'
 import Sprite from '../../components/Sprite.js'
 import Text from '../../components/Text.js'
+import FPScounter from '../../components/FPScounter.js'
 import eventListeners from '../eventListeners.js'
 import { default as log, Log } from '../log.js'
 import symbols from '../symbols.js'
@@ -135,6 +136,7 @@ export default (component) => {
         RouterView: RouterView(),
         Sprite: Sprite(),
         Text: Text(),
+        FPScounter: FPScounter(),
       },
       writable: false,
       enumerable: false,

package/src/lib/symbols.js

@@ -36,4 +36,6 @@ export default {
   props: Symbol.for('props'),
   // Symbol 'slots' utilized within generated code
   slots: Symbol.for('slots'),
+  // Symbol 'componentType' utilized within generated code
+  componentType: Symbol.for('componentType'),
 }

package/src/lib/templateparser/parser.js

@@ -77,7 +77,7 @@ export default (template = '', componentName, parentComponent, filePath = null)
     const match = moveCursorOnMatch(emptyTagStartRegex)
     if (match) {
       tags.push({
-        type: null,
+        [Symbol.for('componentType')]: null,
         [symbols.type]: 'opening',
         [symbols.level]: currentLevel,
         [symbols.cursorTagStart]: prevCursor,
@@ -94,7 +94,7 @@ export default (template = '', componentName, parentComponent, filePath = null)
     if (match) {
       currentLevel--
       tags.push({
-        type: null,
+        [Symbol.for('componentType')]: null,
         [symbols.type]: 'closing',
         [symbols.level]: currentLevel,
       })
@@ -108,7 +108,7 @@ export default (template = '', componentName, parentComponent, filePath = null)
     const match = moveCursorOnMatch(tagStartRegex)
     if (match) {
       currentTag = {
-        type: match[1],
+        [Symbol.for('componentType')]: match[1],
         [symbols.level]: currentLevel,
         [symbols.cursorTagStart]: prevCursor,
       }
@@ -221,7 +221,7 @@ export default (template = '', componentName, parentComponent, filePath = null)
           [symbols.level]: element[symbols.level],
           [symbols.type]: element[symbols.type],
           [symbols.cursorTagStart]: element[symbols.cursorTagStart],
-          type: element.type,
+          [Symbol.for('componentType')]: element[Symbol.for('componentType')],
           parent: currentParent, // helps getting the previous parent when closing tag is encountered
         })
       } else if (element[symbols.type] === 'closing') {
@@ -230,7 +230,9 @@ export default (template = '', componentName, parentComponent, filePath = null)
         let isTagMismatch = false
         if (!isStackEmpty) {
           isLevelMismatch = stack[stack.length - 1][symbols.level] !== element[symbols.level]
-          isTagMismatch = stack[stack.length - 1].type !== element.type
+          isTagMismatch =
+            stack[stack.length - 1][Symbol.for('componentType')] !==
+            element[Symbol.for('componentType')]
         }
 
         if (isStackEmpty || isLevelMismatch || isTagMismatch) {
@@ -329,7 +331,7 @@ export default (template = '', componentName, parentComponent, filePath = null)
       let currentParent = parentComponent
 
       while (currentParent) {
-        hierarchy = `${currentParent.type}/${hierarchy}`
+        hierarchy = `${currentParent[Symbol.for('componentType')]}/${hierarchy}`
         currentParent = currentParent.parent
       }
       return hierarchy

package/vite/index.js

@@ -1,3 +1,20 @@
+/*
+ * Copyright 2023 Comcast Cable Communications Management, LLC
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
 import preCompiler from './preCompiler.js'
 import { importChunkUrl } from '@lightningjs/vite-plugin-import-chunk-url'
 

package/vite/preCompiler.js

@@ -1,6 +1,21 @@
-import parser from '../src/lib/templateparser/parser.js'
-import generator from '../src/lib/codegenerator/generator.js'
-import path from 'path'
+/*
+ * Copyright 2023 Comcast Cable Communications Management, LLC
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import compiler from '../src/lib/precompiler/precompiler.js'
 
 export default function () {
   let config
@@ -11,42 +26,7 @@ export default function () {
     },
     transform(source, filePath) {
       if (config.blits && config.blits.precompile === false) return source
-      if (source.indexOf('Blits.Component(') > -1 || source.indexOf('Blits.Application(') > -1) {
-        // get the start of the template key in de component configuration object
-        const templateKeyRegex = /template:\s*([`"'])*/g
-        const templateStartResult = templateKeyRegex.exec(source)
-        const typeOfQuotesUsed = templateStartResult[1]
-        const templateStartIndex = templateStartResult.index
-
-        // get the template contents from the configuration object
-        const templateContentsRegex = new RegExp(
-          `${typeOfQuotesUsed}([\\s\\S]*?)${typeOfQuotesUsed}`
-        )
-
-        const templateContentResult = templateContentsRegex.exec(source.slice(templateStartIndex))
-        const templateEndIndex =
-          templateStartIndex + templateContentResult.index + templateContentResult[0].length
-
-        // Parse the template
-        let resourceName = 'Blits.Application'
-        if (source.indexOf('Blits.Component(') > -1) {
-          resourceName = source.match(/Blits\.Component\(['"](.*)['"]\s*,/)[1]
-        }
-        const componentPath = path.relative(process.cwd(), filePath)
-        const parsed = parser(templateContentResult[1], resourceName, null, componentPath)
-
-        // Generate the code
-        const code = generator.call({ components: {} }, parsed)
-
-        // Insert the code in the component using the 'code' key, replacing the template key
-        const replacement = `code: { render: ${code.render.toString()}, effects: [${code.effects.map(
-          (fn) => fn.toString() + ','
-        )}], context: {}}`
-        const newSource =
-          source.substring(0, templateStartIndex) + replacement + source.substring(templateEndIndex)
-
-        return newSource
-      }
+      return compiler(source, filePath)
     },
   }
 }

package/bin/index.cjs

@@ -1,25 +0,0 @@
-#!/usr/bin/env node
-
-const path = require('path')
-const fs = require('fs')
-
-const folder = process.argv.slice(2).pop()
-
-if (!folder) {
-  console.error('Please specify a folder for your new Lightning 3 App')
-} else {
-  if (fs.existsSync(folder)) {
-    console.error(`The directory ${folder} already exists! Choose a different location.`)
-  } else {
-    fs.cpSync(path.join(__dirname, '..', 'boilerplate'), folder, { recursive: true })
-    console.log(
-      '================================== ⚡️⚡️⚡️⚡️ ================================== '
-    )
-    console.log('Your new boilerplate Lightning 3 App has been created!')
-    console.log('')
-    console.log(`Go to ${folder}, run npm install, followed by npm run dev to get started`)
-    console.log(
-      '================================== ⚡️⚡️⚡️⚡️ ================================== '
-    )
-  }
-}

package/boilerplate/.vscode/settings.json

@@ -1,10 +0,0 @@
-{
-    "editor.formatOnSave": false,
-    "eslint.validate": [
-      "javascript"
-    ],
-    "editor.codeActionsOnSave": {
-      "source.fixAll.eslint": true
-    },
-    "js/ts.implicitProjectConfig.checkJs": true
-  }