Improve globalFqn parsing for refined module and declaration properties

Author: JohT

cypher/Typescript_Enrichment/Add_module_properties.cypher

@@ -1,20 +1,28 @@
-// Add "namespace", "module" and "name" properties to Typescript nodes that have a globalFqn property
-
+// Add extended properties to Typescript nodes with a globalFqn like "namespace", "module", "name" and "extension" as well as markers like "isNodeModule", "isUnresolvedImport" and "isExternalImport"
  MATCH (ts:TS)
  WHERE ts.globalFqn IS NOT NULL
+OPTIONAL MATCH (class:TS:Class)-[:DECLARES]->(ts)
   WITH ts
-      ,replace(split(ts.globalFqn, '".')[0],'"', '')                                      AS moduleName
-      ,replace(split(ts.globalFqn, '/index')[0],'"', '')                                  AS moduleNameWithoutIndex
-      ,split(ts.globalFqn, '".')[1]                                                       AS symbolName
-      ,split(nullif(reverse(split(reverse(ts.globalFqn), '@')[0]), ts.globalFqn), '/')[0] AS namespaceName
-      ,(ts.globalFqn contains '/node_modules/')                                           AS isNodeModule
-      ,((NOT ts.globalFqn STARTS WITH '/') AND size(split(ts.globalFqn, '/')) < 3)        AS isUnresolvedImport
+      ,replace(split(ts.globalFqn, '".')[0],'"', '')                                        AS modulePathName
+      ,reverse(split(reverse(replace(split(ts.globalFqn, '".')[0],'"', '')), '/')[0])       AS moduleName
+      ,replace(split(split(ts.globalFqn, '/index')[0], '.default')[0],'"', '')              AS modulePathNameWithoutIndexAndDefault
+      ,nullif(split(ts.globalFqn, '".')[1], 'default')                                      AS symbolName
+      ,split(nullif(reverse(split(reverse(ts.globalFqn), '@')[0]), ts.globalFqn), '/')[0]   AS namespaceName
+      ,(ts.globalFqn contains '/node_modules/')                                             AS isNodeModule
+      ,((NOT ts.globalFqn STARTS WITH '/') AND size(split(ts.globalFqn, '/')) < 3)          AS isUnresolvedImport
+      ,reverse(split(reverse(class.globalFqn), '.')[0])                                     AS optionalClassName
   WITH *
-      ,reverse(split(reverse(moduleNameWithoutIndex), '/')[0]) AS indexedName
-      ,coalesce('@' + nullif(namespaceName, ''), '')           AS namespaceNameWithAtPrefixed
+      ,split(reverse(split(reverse(modulePathNameWithoutIndexAndDefault), '/')[0]), '.')[0] AS indexAndExtensionOmittedName
+      ,replace(moduleName, nullif(split(moduleName, '.')[0], moduleName) + '.', '')         AS moduleNameExtensionExtended
+      ,nullif(reverse(split(reverse(moduleName), '.')[0]), moduleName)                      AS moduleNameExtension
+      ,coalesce('@' + nullif(namespaceName, ''), '')                                        AS namespaceNameWithAtPrefixed
+      ,replace(symbolName, coalesce(optionalClassName + '.', ''), '')                       AS symbolNameWithoutClassName
     SET ts.namespace          = namespaceNameWithAtPrefixed
-       ,ts.module             = moduleName
-       ,ts.name               = coalesce(symbolName, indexedName)
+       ,ts.module             = modulePathName
+       ,ts.moduleName         = moduleName
+       ,ts.name               = coalesce(symbolNameWithoutClassName, indexAndExtensionOmittedName)
+       ,ts.extensionExtended  = moduleNameExtensionExtended
+       ,ts.extension          = moduleNameExtension
        ,ts.isNodeModule       = isNodeModule
        ,ts.isUnresolvedImport = isUnresolvedImport
        ,ts.isExternalImport   = isNodeModule OR isUnresolvedImport