Minor refactoring

Author: cdoublev

lib/parse/shorthand.js

@@ -88,8 +88,8 @@ function parseCoordinatedValueList(lists, longhands) {
  * @see {@link https://drafts.csswg.org/css-animations-1/#propdef-animation}
  */
 function parseAnimation(animations, [...longhands]) {
-    const resetOnly = longhands.splice(longhands.indexOf(shorthands.resetOnly.animation[0]), Infinity)
-    const declarations =  parseCoordinatedValueList(animations, longhands)
+    const resetOnly = longhands.splice(longhands.indexOf(shorthands.resetOnly.animation[0]))
+    const declarations = parseCoordinatedValueList(animations, longhands)
     resetOnly.forEach(longhand => declarations.set(longhand, properties[longhand].initial.parsed))
     return declarations
 }
@@ -123,7 +123,7 @@ function parseAnimationRange(ranges, longhands) {
 function parseBackground(layers, [...longhands]) {
     const [bgLayers,, finalBgLayer] = layers
     const bgColor = finalBgLayer.pop()
-    const resetOnly = longhands.splice(longhands.indexOf(shorthands.resetOnly.background[0]), Infinity)
+    const resetOnly = longhands.splice(longhands.indexOf(shorthands.resetOnly.background[0]))
     const declarations = new Map(longhands.map(longhand =>
         longhand === 'background-color'
             ? [longhand, isOmitted(bgColor) ? properties[longhand].initial.parsed : bgColor]

scripts/extract.js

@@ -13,7 +13,6 @@
  *   - ./lib/values/pseudos.js
  */
 const { addQuotes, tab } = require('../lib/utils/string.js')
-const { join, resolve } = require('node:path')
 const arbitrary = require('../lib/parse/arbitrary.js')
 const blocks = require('../lib/values/blocks.js')
 const colors = require('../lib/values/colors.js')
@@ -23,6 +22,7 @@ const forgiving = require('../lib/values/forgiving.js')
 const fs = require('node:fs/promises')
 const logical = require('../lib/properties/logical.js')
 const parseDefinition = require('../lib/parse/definition.js')
+const path = require('node:path')
 const pseudos = require('../lib/values/pseudos.js')
 const { rules } = require('../lib/rules/definitions.js')
 const { serializeDefinition } = require('../lib/serialize.js')
@@ -1001,8 +1001,6 @@ function addRules(definitions = [], key) {
  */
 function build(specifications) {
 
-    const header = `\n// Generated from ${__filename}\n\nmodule.exports = {\n`
-
     Object.entries(specifications).forEach(([key, { atrules, properties, selectors, values }]) => {
         if (excluded.specifications.includes(key)) {
             return
@@ -1017,14 +1015,14 @@ function build(specifications) {
 
     return Promise.all([
         fs.writeFile(
-            resolve(join(__dirname, '..', 'lib', 'descriptors', 'definitions.js')),
-            `${header}${serializeDescriptors(descriptors.sort(sortByName))}}\n`),
+            path.join(__dirname, '..', 'lib', 'descriptors', 'definitions.js'),
+            `\nmodule.exports = {\n${serializeDescriptors(descriptors.sort(sortByName))}}\n`),
         fs.writeFile(
-            resolve(join(__dirname, '..', 'lib', 'properties', 'definitions.js')),
-            `${header}${serializeProperties(properties.sort(sortByName))}}\n`),
+            path.join(__dirname, '..', 'lib', 'properties', 'definitions.js'),
+            `\nmodule.exports = {\n${serializeProperties(properties.sort(sortByName))}}\n`),
         fs.writeFile(
-            resolve(join(__dirname, '..', 'lib', 'values', 'definitions.js')),
-            `${header}${serializeTypes(types.sort(sortByName))}}\n`),
+            path.join(__dirname, '..', 'lib', 'values', 'definitions.js'),
+            `\nmodule.exports = {\n${serializeTypes(types.sort(sortByName))}}\n`),
     ])
 }
 

scripts/initial.js

@@ -158,13 +158,13 @@ function serializeDescriptorDefinitions(descriptors) {
  */
 function serializeDefinitions() {
     const dependency = "const { list, omitted } = require('../values/value.js')"
-    const header = `\n// Generated from ${__filename}\n\n${dependency}\n\nmodule.exports = {\n`
+    const header = `\n${dependency}\n\nmodule.exports = {\n`
     return Promise.all([
         fs.writeFile(
-            path.resolve(__dirname, '../lib/descriptors/definitions.js'),
+            path.join(__dirname, '..', 'lib', 'descriptors', 'definitions.js'),
             `${header}${serializeDescriptorDefinitions(descriptors)}}\n`),
         fs.writeFile(
-            path.resolve(__dirname, '../lib/properties/definitions.js'),
+            path.join(__dirname, '..', 'lib', 'properties', 'definitions.js'),
             `${header}${serializePropertyDefinitions(properties)}}\n`),
     ])
 }